perfschema compilation, test and misc fixes

304 files changed, 18627 insertions, 62064 deletions

diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
index e85f3ffbde3..cccf72591cc 100644
--- a/mysql-test/include/default_mysqld.cnf
+++ b/mysql-test/include/default_mysqld.cnf
@@ -76,7 +76,13 @@ loose-performance-schema-max-cond-instances=1000
 loose-performance-schema-max-file-instances=10000
 loose-performance-schema-max-socket-instances=1000
 loose-performance-schema-max-table-instances=500
+loose-performance-schema-max-table-lock-stat=500
+loose-performance-schema-max-index-stat=5000
 loose-performance-schema-max-table-handles=1000
+loose-performance-schema-max-prepared-statements-instances=100
+loose-performance-schema-max-program-instances=5000
+loose-performance-schema-setup-actors-size=100
+loose-performance-schema-setup-objects-size=100
 
 loose-performance-schema-events-waits-history-size=10
 loose-performance-schema-events-waits-history-long-size=10000
@@ -84,8 +90,11 @@ loose-performance-schema-events-stages-history-size=10
 loose-performance-schema-events-stages-history-long-size=1000
 loose-performance-schema-events-statements-history-size=10
 loose-performance-schema-events-statements-history-long-size=1000
+loose-performance-schema-events-transactions-history-size=10
+loose-performance-schema-events-transactions-history-long-size=1000
 loose-performance-schema-max-thread-instances=200
 loose-performance-schema-session-connect-attrs-size=2048
+loose-performance-schema-max-metadata-locks=10000
 
 # Enable everything, for maximun code exposure during testing
 
@@ -97,6 +106,9 @@ loose-performance-schema-consumer-events-stages-history-long=ON
 loose-performance-schema-consumer-events-statements-current=ON
 loose-performance-schema-consumer-events-statements-history=ON
 loose-performance-schema-consumer-events-statements-history-long=ON
+loose-performance-schema-consumer-events-transactions-current=ON
+loose-performance-schema-consumer-events-transactions-history=ON
+loose-performance-schema-consumer-events-transactions-history-long=ON
 loose-performance-schema-consumer-events-waits-current=ON
 loose-performance-schema-consumer-events-waits-history=ON
 loose-performance-schema-consumer-events-waits-history-long=ON
diff --git a/mysql-test/include/wait_for_sql_thread_read_all.inc b/mysql-test/include/wait_for_sql_thread_read_all.inc
index ec5ecd0cb17..1bbb006f3a8 100644
--- a/mysql-test/include/wait_for_sql_thread_read_all.inc
+++ b/mysql-test/include/wait_for_sql_thread_read_all.inc
@@ -1,6 +1,6 @@
 --let $show_statement = show all slaves status
 --let $field = Slave_SQL_State
---let $condition = = 'Slave has read all relay log; waiting for the slave I/O thread to update it'
+--let $condition = = 'Slave has read all relay log; waiting for more updates'
 --let $wait_for_all = 1
 --source include/wait_show_condition.inc
 
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 20f40b94337..9c9b62662db 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -756,13 +756,21 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-consumer-events-statements-current 
  Default startup value for the events_statements_current
  consumer.
- (Defaults to on; use --skip-performance-schema-consumer-events-statements-current to disable.)
  --performance-schema-consumer-events-statements-history 
  Default startup value for the events_statements_history
  consumer.
  --performance-schema-consumer-events-statements-history-long 
  Default startup value for the
  events_statements_history_long consumer.
+ --performance-schema-consumer-events-transactions-current 
+ Default startup value for the events_transactions_current
+ consumer.
+ --performance-schema-consumer-events-transactions-history 
+ Default startup value for the events_transactions_history
+ consumer.
+ --performance-schema-consumer-events-transactions-history-long 
+ Default startup value for the
+ events_transactions_history_long consumer.
  --performance-schema-consumer-events-waits-current 
  Default startup value for the events_waits_current
  consumer.
@@ -798,6 +806,12 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-events-statements-history-size=# 
  Number of rows per thread in EVENTS_STATEMENTS_HISTORY.
  Use 0 to disable, -1 for automated sizing.
+ --performance-schema-events-transactions-history-long-size=# 
+ Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0
+ to disable, -1 for automated sizing.
+ --performance-schema-events-transactions-history-size=# 
+ Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY.
+ Use 0 to disable, -1 for automated sizing.
  --performance-schema-events-waits-history-long-size=# 
  Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to
  disable, -1 for automated sizing.
@@ -825,11 +839,25 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-max-file-instances=# 
  Maximum number of instrumented files. Use 0 to disable,
  -1 for automated sizing.
+ --performance-schema-max-index-stat=# 
+ Maximum number of index statistics for instrumented
+ tables. Use 0 to disable, -1 for automated scaling.
+ --performance-schema-max-memory-classes=# 
+ Maximum number of memory pool instruments.
+ --performance-schema-max-metadata-locks=# 
+ Maximum number of metadata locks. Use 0 to disable, -1
+ for automated scaling.
  --performance-schema-max-mutex-classes=# 
  Maximum number of mutex instruments.
  --performance-schema-max-mutex-instances=# 
  Maximum number of instrumented MUTEX objects. Use 0 to
  disable, -1 for automated sizing.
+ --performance-schema-max-prepared-statements-instances=# 
+ Maximum number of instrumented prepared statements. Use 0
+ to disable, -1 for automated scaling.
+ --performance-schema-max-program-instances=# 
+ Maximum number of instrumented programs. Use 0 to
+ disable, -1 for automated scaling.
  --performance-schema-max-rwlock-classes=# 
  Maximum number of rwlock instruments.
  --performance-schema-max-rwlock-instances=# 
@@ -840,16 +868,23 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-max-socket-instances=# 
  Maximum number of opened instrumented sockets. Use 0 to
  disable, -1 for automated sizing.
+ --performance-schema-max-sql-text-length=# 
+ Maximum length of displayed sql text.
  --performance-schema-max-stage-classes=# 
  Maximum number of stage instruments.
  --performance-schema-max-statement-classes=# 
  Maximum number of statement instruments.
+ --performance-schema-max-statement-stack=# 
+ Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
  --performance-schema-max-table-handles=# 
  Maximum number of opened instrumented tables. Use 0 to
  disable, -1 for automated sizing.
  --performance-schema-max-table-instances=# 
  Maximum number of instrumented tables. Use 0 to disable,
  -1 for automated sizing.
+ --performance-schema-max-table-lock-stat=# 
+ Maximum number of lock statistics for instrumented
+ tables. Use 0 to disable, -1 for automated scaling.
  --performance-schema-max-thread-classes=# 
  Maximum number of thread instruments.
  --performance-schema-max-thread-instances=# 
@@ -1613,9 +1648,12 @@ performance-schema-accounts-size -1
 performance-schema-consumer-events-stages-current FALSE
 performance-schema-consumer-events-stages-history FALSE
 performance-schema-consumer-events-stages-history-long FALSE
-performance-schema-consumer-events-statements-current TRUE
+performance-schema-consumer-events-statements-current FALSE
 performance-schema-consumer-events-statements-history FALSE
 performance-schema-consumer-events-statements-history-long FALSE
+performance-schema-consumer-events-transactions-current FALSE
+performance-schema-consumer-events-transactions-history FALSE
+performance-schema-consumer-events-transactions-history-long FALSE
 performance-schema-consumer-events-waits-current FALSE
 performance-schema-consumer-events-waits-history FALSE
 performance-schema-consumer-events-waits-history-long FALSE
@@ -1627,6 +1665,8 @@ performance-schema-events-stages-history-long-size -1
 performance-schema-events-stages-history-size -1
 performance-schema-events-statements-history-long-size -1
 performance-schema-events-statements-history-size -1
+performance-schema-events-transactions-history-long-size -1
+performance-schema-events-transactions-history-size -1
 performance-schema-events-waits-history-long-size -1
 performance-schema-events-waits-history-size -1
 performance-schema-hosts-size -1
@@ -1634,24 +1674,32 @@ performance-schema-instrument
 performance-schema-max-cond-classes 90
 performance-schema-max-cond-instances -1
 performance-schema-max-digest-length 1024
-performance-schema-max-file-classes 50
+performance-schema-max-file-classes 80
 performance-schema-max-file-handles 32768
 performance-schema-max-file-instances -1
-performance-schema-max-mutex-classes 200
+performance-schema-max-index-stat -1
+performance-schema-max-memory-classes 320
+performance-schema-max-metadata-locks -1
+performance-schema-max-mutex-classes 210
 performance-schema-max-mutex-instances -1
-performance-schema-max-rwlock-classes 40
+performance-schema-max-prepared-statements-instances -1
+performance-schema-max-program-instances -1
+performance-schema-max-rwlock-classes 50
 performance-schema-max-rwlock-instances -1
 performance-schema-max-socket-classes 10
 performance-schema-max-socket-instances -1
+performance-schema-max-sql-text-length 1024
 performance-schema-max-stage-classes 160
-performance-schema-max-statement-classes 202
+performance-schema-max-statement-classes 222
+performance-schema-max-statement-stack 10
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1
+performance-schema-max-table-lock-stat -1
 performance-schema-max-thread-classes 50
 performance-schema-max-thread-instances -1
 performance-schema-session-connect-attrs-size -1
-performance-schema-setup-actors-size 100
-performance-schema-setup-objects-size 100
+performance-schema-setup-actors-size -1
+performance-schema-setup-objects-size -1
 performance-schema-users-size -1
 port 3306
 port-open-timeout 0
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 f3f561fd479..c3fbc3a9137 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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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 a68e62e4642..c23665cb2de 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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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	starting	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 ad109501f98..f99edef092f 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>	starting	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>	starting	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>	starting	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>	starting	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>	starting	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 169053cb6be..bae43a37be5 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>	starting	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>	starting	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>	starting	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>	starting	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>	starting	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/multi_source/info_logs.result b/mysql-test/suite/multi_source/info_logs.result
index f8519a99964..b0a112aaf3b 100644
--- a/mysql-test/suite/multi_source/info_logs.result
+++ b/mysql-test/suite/multi_source/info_logs.result
@@ -90,16 +90,16 @@ MASTER 2.2
 #
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
-MASTER 2.2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
+MASTER 2.2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 include/wait_for_slave_to_start.inc
 set default_master_connection = 'MASTER 2.2';
 include/wait_for_slave_to_start.inc
 set default_master_connection = '';
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	6	0	60.000	
-MASTER 2.2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	6	0	60.000	
+	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	relay.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	6	0	60.000	
+MASTER 2.2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	relay-master@00202@002e2.000004	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space2>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	6	0	60.000	
 #
 # List of files matching '*info*' pattern
 #   after slave server restart
diff --git a/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result b/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result
index de38313401d..b1aa31d059a 100644
--- a/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result
+++ b/mysql-test/suite/multi_source/multi_source_slave_alias_replica.result
@@ -21,7 +21,7 @@ connection slave;
 "Command: SHOW ALL STAVES STATUS --> SHOW ALL REPLICAS STATUS"
 SHOW ALL REPLICAS STATUS;
 Connection_name	slave1
-Slave_SQL_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_State	Slave has read all relay log; waiting for more updates
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
 Master_User	root
@@ -71,7 +71,7 @@ Replicate_Ignore_Domain_Ids
 Parallel_Mode	optimistic
 SQL_Delay	0
 SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_Running_State	Slave has read all relay log; waiting for more updates
 Slave_DDL_Groups	0
 Slave_Non_Transactional_Groups	0
 Slave_Transactional_Groups	0
@@ -82,7 +82,7 @@ Slave_received_heartbeats	0
 Slave_heartbeat_period	60.000
 Gtid_Slave_Pos	
 Connection_name	slave2
-Slave_SQL_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_State	Slave has read all relay log; waiting for more updates
 Slave_IO_State	Waiting for master to send event
 Master_Host	127.0.0.1
 Master_User	root
@@ -132,7 +132,7 @@ Replicate_Ignore_Domain_Ids
 Parallel_Mode	optimistic
 SQL_Delay	0
 SQL_Remaining_Delay	NULL
-Slave_SQL_Running_State	Slave has read all relay log; waiting for the slave I/O thread to update it
+Slave_SQL_Running_State	Slave has read all relay log; waiting for more updates
 Slave_DDL_Groups	0
 Slave_Non_Transactional_Groups	0
 Slave_Transactional_Groups	0
diff --git a/mysql-test/suite/multi_source/simple.result b/mysql-test/suite/multi_source/simple.result
index 922c7555875..a66d49e88cb 100644
--- a/mysql-test/suite/multi_source/simple.result
+++ b/mysql-test/suite/multi_source/simple.result
@@ -19,8 +19,8 @@ connection master2;
 connection slave;
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-slave1	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave1.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+slave1	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_1	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave1.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			1			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 start all slaves;
 stop slave 'slave1';
 show slave 'slave1' status;
@@ -81,11 +81,11 @@ reset slave 'slave1';
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
 slave1			127.0.0.1	root	MYPORT_1	60		4		<relay_log_pos>		No	No							0		0	0	<relay_log_space1>	None		0	No						NULL	No	0		0			1			No				optimistic	0	NULL		0	0	0	0	1073741824	7	0	60.000	
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 reset slave 'slave1' all;
 show all slaves status;
 Connection_name	Slave_SQL_State	Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id	Master_SSL_Crl	Master_SSL_Crlpath	Using_Gtid	Gtid_IO_Pos	Replicate_Do_Domain_Ids	Replicate_Ignore_Domain_Ids	Parallel_Mode	SQL_Delay	SQL_Remaining_Delay	Slave_SQL_Running_State	Slave_DDL_Groups	Slave_Non_Transactional_Groups	Slave_Transactional_Groups	Retried_transactions	Max_relay_log_size	Executed_log_entries	Slave_received_heartbeats	Slave_heartbeat_period	Gtid_Slave_Pos
-slave2	Slave has read all relay log; waiting for the slave I/O thread to update it	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for the slave I/O thread to update it	0	0	0	0	1073741824	7	0	60.000	
+slave2	Slave has read all relay log; waiting for more updates	Waiting for master to send event	127.0.0.1	root	MYPORT_2	60	master-bin.000001	<read_master_log_pos>	mysqld-relay-bin-slave2.000002	<relay_log_pos>	master-bin.000001	Yes	Yes							0		0	<read_master_log_pos>	<relay_log_space1>	None		0	No						0	No	0		0			2			No				optimistic	0	NULL	Slave has read all relay log; waiting for more updates	0	0	0	0	1073741824	7	0	60.000	
 stop all slaves;
 Warnings:
 Note	1938	SLAVE 'slave2' stopped
diff --git a/mysql-test/suite/perfschema/disabled.def b/mysql-test/suite/perfschema/disabled.def
index 321cd7dcd16..9c36708729a 100644
--- a/mysql-test/suite/perfschema/disabled.def
+++ b/mysql-test/suite/perfschema/disabled.def
@@ -24,3 +24,34 @@ binlog_ok_row: needs slave_relay_log_info
 binlog_ok_stmt: needs slave_relay_log_info
 
 server_init : Nirbhay TODO: Fix the test
+show_sanity:
+threads_mysql_freebsd:
+
+transaction_gtid: needs to be updated for MariaDB gtids
+
+ddl_replication_applier_status_by_worker: todo
+ddl_replication_connection_status: todo
+dml_replication_applier_status_by_worker: todo
+dml_replication_connection_status: todo
+
+dml_replication_group_member_stats: todo?
+ddl_replication_group_member_stats: todo?
+ddl_replication_group_members: todo?
+dml_replication_group_members: todo?
+replication_group_members: todo?
+replication_group_member_stats: todo?
+rpl_group_member_stats: todo?
+rpl_group_members: todo?
+
+ddl_session_variables: todo
+ddl_global_variables: todo
+ddl_variables_by_thread: todo
+dml_global_variables: todo
+dml_session_variables: todo
+dml_variables_by_thread: todo
+variables_by_thread: todo
+show_coverage: todo
+show_misc: todo
+show_plugin: todo
+
+status_reprepare:why P_S filters out Com_* variables?
diff --git a/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc b/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc
index 6dbccaee9a0..1272c0921e7 100644
--- a/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc
@@ -54,6 +54,7 @@
 --source include/have_perfschema.inc
 --source include/no_protocol.inc
 --source ../include/wait_for_pfs_thread_count.inc
+--source include/not_windows.inc
 
 --disable_query_log
 
diff --git a/mysql-test/suite/perfschema/include/program_nested_setup.inc b/mysql-test/suite/perfschema/include/program_nested_setup.inc
index bbf885988dd..1f96fa28f93 100644
--- a/mysql-test/suite/perfschema/include/program_nested_setup.inc
+++ b/mysql-test/suite/perfschema/include/program_nested_setup.inc
@@ -3,6 +3,7 @@
 #
 
 --source include/no_protocol.inc
+--source include/have_innodb.inc
 
 --echo # SET-UP
 CREATE DATABASE nested_sp;
@@ -16,7 +17,7 @@ CREATE TABLE t1(
 CREATE TABLE t2(
   n INT UNSIGNED NOT NULL, 
   f BIGINT UNSIGNED
-);
+) engine=innodb;
 
 --echo ############################
 --echo # Creating Stored Programs #
diff --git a/mysql-test/suite/perfschema/include/program_setup.inc b/mysql-test/suite/perfschema/include/program_setup.inc
index 0d7f1ef3058..a4e7f2451b6 100644
--- a/mysql-test/suite/perfschema/include/program_setup.inc
+++ b/mysql-test/suite/perfschema/include/program_setup.inc
@@ -3,6 +3,7 @@
 #
 
 --source include/no_protocol.inc
+--source include/have_innodb.inc
 
 --echo # SET-UP 
 
@@ -12,12 +13,12 @@ USE stored_programs;
 CREATE TABLE t1(
    i INT NOT NULL,
    j INT
-);
+) engine=innodb;
 
 CREATE TABLE t2(
    name   CHAR(16) NOT NULL DEFAULT '',
    id INT NOT NULL
-);
+) engine=innodb;
 
 CREATE TABLE t3(
    d DATE,
diff --git a/mysql-test/suite/perfschema/include/show_plugin_verifier_56.inc b/mysql-test/suite/perfschema/include/show_plugin_verifier_56.inc
deleted file mode 100644
index 7e144899497..00000000000
--- a/mysql-test/suite/perfschema/include/show_plugin_verifier_56.inc
+++ /dev/null
@@ -1,29 +0,0 @@
---disable_warnings
-
---echo
-SHOW GLOBAL STATUS LIKE "example_%";
---echo
-SHOW SESSION STATUS LIKE "example_%";
---echo
-SHOW GLOBAL VARIABLES LIKE "example_%";
---echo
-SHOW SESSION VARIABLES LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
---echo
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-
-#
-# Force sync of local and global system variables.
-#
---disable_result_log
---disable_query_log
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread WHERE variable_name LIKE "example_%";
---enable_query_log
---enable_result_log
-
---enable_warnings
diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc
index ec2912217cd..1297bcdff82 100644
--- a/mysql-test/suite/perfschema/include/start_server_common.inc
+++ b/mysql-test/suite/perfschema/include/start_server_common.inc
@@ -87,20 +87,20 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
+#select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
+#select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
+#select * from performance_schema.global_variables;
+#select * from performance_schema.variables_by_thread;
+#select * from performance_schema.session_variables;
 --enable_result_log
 
 # This has a stable output, printing the result:
diff --git a/mysql-test/suite/perfschema/include/table_io_result_helper.inc b/mysql-test/suite/perfschema/include/table_io_result_helper.inc
index 4732806488e..66431b6a8c6 100644
--- a/mysql-test/suite/perfschema/include/table_io_result_helper.inc
+++ b/mysql-test/suite/perfschema/include/table_io_result_helper.inc
@@ -14,8 +14,7 @@ eval select event_name,
   order by thread_id, event_id;
 
 # In case of failures, this will tell if table io are lost.
-show status where Variable_name like 'performance_schema_%' and
-                  Variable_name not like 'performance_schema_%_classes_lost';
+show global status like 'performance_schema_%';
 
 # Cleanup
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc b/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
index e81a42b4817..6a6e2dc5ada 100644
--- a/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
+++ b/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
@@ -29,15 +29,14 @@ if(!$success)
 --echo # Verify
 --echo #========================================================================
 
-SELECT event_id from performance_schema.events_transactions_history_long
+SELECT event_id into @base_tx_event_id
+  from performance_schema.events_transactions_history_long
   where (THREAD_ID = @con1_thread_id)
-  order by event_id limit 1
-  into @base_tx_event_id;
+  order by event_id limit 1;
 
-SELECT event_id from performance_schema.events_statements_history_long
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
   where (THREAD_ID = @con1_thread_id)
-  order by event_id limit 1
-  into @base_stmt_event_id;
+  order by event_id limit 1;
 
 select if(@base_tx_event_id < @base_stmt_event_id,
           @base_tx_event_id - 1,
diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc
index 7bc6d356175..c16e90c78c2 100644
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc
@@ -13,5 +13,3 @@
 --remove_file $MYSQLTEST_VARDIR/tmp/out_file
 --remove_file $MYSQLTEST_VARDIR/tmp/err_file
 --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
-
---source include/mysql_upgrade_cleanup.inc
\ No newline at end of file
diff --git a/mysql-test/suite/perfschema/r/alter_table_progress.result b/mysql-test/suite/perfschema/r/alter_table_progress.result
index 6625f965079..96516993a5c 100644
--- a/mysql-test/suite/perfschema/r/alter_table_progress.result
+++ b/mysql-test/suite/perfschema/r/alter_table_progress.result
@@ -1,17 +1,23 @@
+connect  con1, localhost, root, , ;
 drop table if exists t1;
 create table t1(a int) engine = myisam;
 insert into t1 values (1), (2), (3), (4), (5);
+connection default;
 update performance_schema.threads
 set instrumented = 'NO'
   where processlist_id = connection_id();
 truncate table performance_schema.events_statements_history_long;
 truncate table performance_schema.events_stages_history_long;
+connection con1;
 SET DEBUG_SYNC='RESET';
 SET DEBUG_SYNC='copy_data_between_tables_before SIGNAL found_row WAIT_FOR wait_row EXECUTE 5';
 ALTER TABLE t1 engine = innodb;;
+connection default;
 SET DEBUG_SYNC='now WAIT_FOR found_row';
 select event_id from performance_schema.events_statements_current
 where thread_id = @con1_thread_id into @con1_stmt_id;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
 from performance_schema.events_stages_current
 where (thread_id = @con1_thread_id);
@@ -46,9 +52,11 @@ where (thread_id = @con1_thread_id);
 EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
 stage/sql/copy to tmp table	4	5
 SET DEBUG_SYNC='now SIGNAL wait_row';
+connection con1;
 select "After payload";
 After payload
 After payload
+connection default;
 Dumping ALTER TABLE stages
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
 from performance_schema.events_stages_history_long
@@ -58,22 +66,35 @@ order by thread_id, event_id;
 EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
 stage/sql/starting	NULL	NULL
 stage/sql/checking permissions	NULL	NULL
-stage/sql/checking permissions	NULL	NULL
-stage/sql/init	NULL	NULL
+stage/sql/init for update	NULL	NULL
 stage/sql/Opening tables	NULL	NULL
+stage/sql/After opening tables	NULL	NULL
 stage/sql/setup	NULL	NULL
 stage/sql/creating table	NULL	NULL
 stage/sql/After create	NULL	NULL
 stage/sql/System lock	NULL	NULL
+stage/sql/table lock	NULL	NULL
+stage/sql/After create	NULL	NULL
 stage/sql/copy to tmp table	5	5
-stage/sql/rename result table	NULL	NULL
-stage/sql/end	NULL	NULL
-stage/sql/query end	NULL	NULL
+stage/sql/Enabling keys	NULL	NULL
+stage/sql/Rename result table	NULL	NULL
+stage/sql/Unlocking tables	NULL	NULL
+stage/sql/Rename result table	NULL	NULL
+stage/sql/End of update loop	NULL	NULL
+stage/sql/Query end	NULL	NULL
+stage/sql/Commit	NULL	NULL
+stage/sql/closing tables	NULL	NULL
+stage/sql/Unlocking tables	NULL	NULL
 stage/sql/closing tables	NULL	NULL
-stage/sql/freeing items	NULL	NULL
-stage/sql/cleaning up	NULL	NULL
+stage/sql/Commit implicit	NULL	NULL
+stage/sql/Starting cleanup	NULL	NULL
+stage/sql/Freeing items	NULL	NULL
+stage/sql/Reset for next command	NULL	NULL
 SET DEBUG_SYNC='RESET';
+connection con1;
 drop table t1;
+disconnect con1;
+connection default;
 update performance_schema.threads
 set instrumented = 'YES'
   where processlist_id = connection_id();
diff --git a/mysql-test/suite/perfschema/r/bad_option.result b/mysql-test/suite/perfschema/r/bad_option.result
index 7c61657af05..b14dad9600e 100644
--- a/mysql-test/suite/perfschema/r/bad_option.result
+++ b/mysql-test/suite/perfschema/r/bad_option.result
@@ -1,4 +1,8 @@
+FOUND 1 /\[ERROR\].*unknown variable 'performance-schema-enabled=maybe'/ in my_restart.err
 # Server start with invalid startup option value 'performance-schema-enabled=maybe' : pass
+FOUND 1 /\[ERROR\].*unknown variable 'performance-schema-max_=12'/ in my_restart.err
 # Server start with ambigous startup option 'performance-schema-max_=12' : pass
+FOUND 1 /\[ERROR\].*unknown option '--performance-schema-unknown_99'/ in my_restart.err
 # Server start with invalid startup option '--performance-schema-unknown_99' : pass
+FOUND 1 /Can.t change dir to .*bad_option_h_param/ in my_restart.err
 # Server start with invalid startup option value '--datadir=bad_option_h_param' : pass
diff --git a/mysql-test/suite/perfschema/r/batch_table_io_func.result b/mysql-test/suite/perfschema/r/batch_table_io_func.result
index 9d923934c64..212c08c7e90 100644
--- a/mysql-test/suite/perfschema/r/batch_table_io_func.result
+++ b/mysql-test/suite/perfschema/r/batch_table_io_func.result
@@ -53,12 +53,15 @@ select 10*X.v + Y.v, 100*X.v + 10*Y.v + Z.v, 100*X.v + 10*Y.v + Z.v
 from t0 X, t0 Y, t0 Z;
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	OK
 analyze table t2;
 Table	Op	Msg_type	Msg_text
+test.t2	analyze	status	Engine-independent statistics collected
 test.t2	analyze	status	OK
 analyze table t3;
 Table	Op	Msg_type	Msg_text
+test.t3	analyze	status	Engine-independent statistics collected
 test.t3	analyze	status	OK
 select * from t1 order by a;
 id1	a
@@ -111,14 +114,14 @@ id2	id3	c
 61	610	610
 61	611	611
 61	612	612
-explain select t1.*, t2.*, t3.*
+explain extended select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	NULL	NULL	NULL	NULL	10	100.00	NULL
-1	SIMPLE	t2	NULL	ALL	NULL	NULL	NULL	NULL	100	10.00	Using where; Using join buffer (Block Nested Loop)
-1	SIMPLE	t3	NULL	ALL	NULL	NULL	NULL	NULL	1000	10.00	Using where; Using join buffer (Block Nested Loop)
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10	100.00	
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	100	100.00	Using where; Using join buffer (flat, BNL join)
+1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	1000	100.00	Using where; Using join buffer (incremental, BNL join)
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where ((`test`.`t2`.`id1` = `test`.`t1`.`id1`) and (`test`.`t3`.`id2` = `test`.`t2`.`id2`))
+Note	1003	select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1`
 call before_payload();
 select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
@@ -126,10 +129,13 @@ call after_payload();
 number_seen	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OPERATION	NUMBER_OF_BYTES
 11	TABLE	test	t1	NULL	fetch	1
 1	TABLE	test	t1	NULL	read external	NULL
+1	TABLE	test	t1	NULL	read normal	NULL
 101	TABLE	test	t2	NULL	fetch	1
 1	TABLE	test	t2	NULL	read external	NULL
+1	TABLE	test	t2	NULL	read normal	NULL
 1	TABLE	test	t3	NULL	fetch	1000
 1	TABLE	test	t3	NULL	read external	NULL
+1	TABLE	test	t3	NULL	read normal	NULL
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
 TABLE	test	t0	NULL	0	0	0
 TABLE	test	t1	NULL	11	11	0
@@ -145,14 +151,14 @@ alter table t2 add unique index(id2);
 alter table t2 add index(id1);
 alter table t3 add unique index(id3);
 alter table t3 add index(id2);
-explain select t1.*, t2.*, t3.*
+explain extended select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	ALL	id1	NULL	NULL	NULL	10	100.00	Using where
-1	SIMPLE	t2	NULL	ref	id2,id1	id1	5	test.t1.id1	10	100.00	Using where
-1	SIMPLE	t3	NULL	ref	id2	id2	5	test.t2.id2	10	100.00	NULL
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	id1	NULL	NULL	NULL	10	100.00	Using where
+1	SIMPLE	t2	ref	id2,id1	id1	5	test.t1.id1	10	100.00	Using where
+1	SIMPLE	t3	ref	id2	id2	5	test.t2.id2	10	100.00	
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where ((`test`.`t2`.`id1` = `test`.`t1`.`id1`) and (`test`.`t3`.`id2` = `test`.`t2`.`id2`))
+Note	1003	select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1`
 call before_payload();
 select t1.*, t2.*, t3.*
 from t1 join t2 using (id1) join t3 using (id2);
@@ -160,10 +166,13 @@ call after_payload();
 number_seen	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OPERATION	NUMBER_OF_BYTES
 11	TABLE	test	t1	NULL	fetch	1
 1	TABLE	test	t1	id1	read external	NULL
+1	TABLE	test	t1	id1	read normal	NULL
 110	TABLE	test	t2	id1	fetch	1
 1	TABLE	test	t2	id2	read external	NULL
+1	TABLE	test	t2	id2	read normal	NULL
 100	TABLE	test	t3	id2	fetch	10
 1	TABLE	test	t3	id3	read external	NULL
+1	TABLE	test	t3	id3	read normal	NULL
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
 TABLE	test	t0	NULL	0	0	0
 TABLE	test	t1	NULL	11	11	0
diff --git a/mysql-test/suite/perfschema/r/connect_attrs.result b/mysql-test/suite/perfschema/r/connect_attrs.result
index 1ed8e16b6ca..eb83cb5e886 100644
--- a/mysql-test/suite/perfschema/r/connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/connect_attrs.result
@@ -37,11 +37,8 @@ SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_connect_attrs;
 COUNT(DISTINCT PROCESSLIST_ID)
 2
-<<<<<<< HEAD
 connection non_privileged_user;
-=======
 # must return 1
->>>>>>> merge-perfschema-5.7
 SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_account_connect_attrs;
 COUNT(DISTINCT PROCESSLIST_ID)
diff --git a/mysql-test/suite/perfschema/r/connection.result b/mysql-test/suite/perfschema/r/connection.result
index d581e5b0b08..332b5a43466 100644
--- a/mysql-test/suite/perfschema/r/connection.result
+++ b/mysql-test/suite/perfschema/r/connection.result
@@ -1,17 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 call dump_all();
 processlist_user	processlist_host
 root	localhost
@@ -25,12 +11,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1a, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1a" as status;
 status
 user1 in con1a
@@ -50,12 +31,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1b, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1b" as status;
 status
 user1 in con1b
@@ -76,12 +52,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1c, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1c" as status;
 status
 user1 in con1c
@@ -103,12 +74,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2a, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2a" as status;
 status
 user2 in con2a
@@ -133,12 +99,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2b, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2b" as status;
 status
 user2 in con2b
@@ -164,12 +125,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2c, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2c" as status;
 status
 user2 in con2c
@@ -196,12 +152,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con3a, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3a" as status;
 status
 user3 in con3a
@@ -231,12 +182,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con3b, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3b" as status;
 status
 user3 in con3b
@@ -267,12 +213,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con3c, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3c" as status;
 status
 user3 in con3c
@@ -304,13 +245,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connection default;
 disconnect con1a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1a disconnected" as status;
 status
 con1a disconnected
@@ -341,12 +277,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con2a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2a disconnected" as status;
 status
 con2a disconnected
@@ -376,12 +307,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con3a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3a disconnected" as status;
 status
 con3a disconnected
@@ -410,8 +336,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -438,8 +362,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -466,8 +388,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -494,12 +414,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con4a, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4a" as status;
 status
 user4 in con4a
@@ -531,12 +446,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con4b, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4b" as status;
 status
 user4 in con4b
@@ -569,12 +479,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con4c, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4c" as status;
 status
 user4 in con4c
@@ -608,13 +513,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connection default;
 disconnect con1b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1b disconnected" as status;
 status
 con1b disconnected
@@ -647,12 +547,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con2b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2b disconnected" as status;
 status
 con2b disconnected
@@ -684,12 +579,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con3b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3b disconnected" as status;
 status
 con3b disconnected
@@ -720,12 +610,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con1c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1c disconnected" as status;
 status
 con1c disconnected
@@ -755,12 +640,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con2c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2c disconnected" as status;
 status
 con2c disconnected
@@ -789,12 +669,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con3c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3c disconnected" as status;
 status
 con3c disconnected
@@ -822,8 +697,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -846,8 +719,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -867,8 +738,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -888,12 +757,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con5a, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5a" as status;
 status
 user5 in con5a
@@ -918,12 +782,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con5b, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5b" as status;
 status
 user5 in con5b
@@ -949,12 +808,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con5c, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5c" as status;
 status
 user5 in con5c
@@ -981,7 +835,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connection default;
 disconnect con4a;
 disconnect con4b;
@@ -989,10 +842,6 @@ disconnect con4c;
 disconnect con5a;
 disconnect con5b;
 disconnect con5c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
 status
 con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -1013,8 +862,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -1031,8 +878,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -1047,8 +892,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -1063,5 +906,3 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
diff --git a/mysql-test/suite/perfschema/r/connection_3a.result b/mysql-test/suite/perfschema/r/connection_3a.result
index 27c4c55de89..e799864edfd 100644
--- a/mysql-test/suite/perfschema/r/connection_3a.result
+++ b/mysql-test/suite/perfschema/r/connection_3a.result
@@ -1,17 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 call dump_all();
 processlist_user	processlist_host
 root	localhost
@@ -25,12 +11,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1a, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1a" as status;
 status
 user1 in con1a
@@ -50,12 +31,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1b, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1b" as status;
 status
 user1 in con1b
@@ -76,12 +52,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1c, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1c" as status;
 status
 user1 in con1c
@@ -103,12 +74,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2a, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2a" as status;
 status
 user2 in con2a
@@ -132,12 +98,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	1
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2b, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2b" as status;
 status
 user2 in con2b
@@ -162,12 +123,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	2
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2c, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2c" as status;
 status
 user2 in con2c
@@ -193,12 +149,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	3
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con3a, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3a" as status;
 status
 user3 in con3a
@@ -226,12 +177,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	4
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con3b, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3b" as status;
 status
 user3 in con3b
@@ -260,12 +206,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	5
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con3c, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3c" as status;
 status
 user3 in con3c
@@ -295,13 +236,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connection default;
 disconnect con1a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1a disconnected" as status;
 status
 con1a disconnected
@@ -330,12 +266,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con2a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2a disconnected" as status;
 status
 con2a disconnected
@@ -363,12 +294,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con3a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3a disconnected" as status;
 status
 con3a disconnected
@@ -395,8 +321,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -421,8 +345,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -447,8 +369,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -473,12 +393,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con4a, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4a" as status;
 status
 user4 in con4a
@@ -507,12 +422,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	7
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con4b, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4b" as status;
 status
 user4 in con4b
@@ -542,12 +452,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	8
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con4c, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4c" as status;
 status
 user4 in con4c
@@ -578,13 +483,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connection default;
 disconnect con1b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1b disconnected" as status;
 status
 con1b disconnected
@@ -614,12 +514,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con2b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2b disconnected" as status;
 status
 con2b disconnected
@@ -648,12 +543,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con3b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3b disconnected" as status;
 status
 con3b disconnected
@@ -681,12 +571,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con1c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1c disconnected" as status;
 status
 con1c disconnected
@@ -713,12 +598,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con2c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2c disconnected" as status;
 status
 con2c disconnected
@@ -744,12 +624,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 disconnect con3c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3c disconnected" as status;
 status
 con3c disconnected
@@ -774,8 +649,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -797,8 +670,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -817,8 +688,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -837,12 +706,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con5a, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5a" as status;
 status
 user5 in con5a
@@ -866,12 +730,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con5b, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5b" as status;
 status
 user5 in con5b
@@ -896,12 +755,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con5c, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5c" as status;
 status
 user5 in con5c
@@ -927,7 +781,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connection default;
 disconnect con4a;
 disconnect con4b;
@@ -935,10 +788,6 @@ disconnect con4c;
 disconnect con5a;
 disconnect con5b;
 disconnect con5c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
 status
 con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -958,8 +807,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -976,8 +823,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -992,8 +837,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -1008,5 +851,3 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
diff --git a/mysql-test/suite/perfschema/r/connection_3a_3u.result b/mysql-test/suite/perfschema/r/connection_3a_3u.result
index 7308af46189..a3758a6ace1 100644
--- a/mysql-test/suite/perfschema/r/connection_3a_3u.result
+++ b/mysql-test/suite/perfschema/r/connection_3a_3u.result
@@ -1,17 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 call dump_all();
 processlist_user	processlist_host
 root	localhost
@@ -25,12 +11,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1a, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1a" as status;
 status
 user1 in con1a
@@ -50,12 +31,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1b, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1b" as status;
 status
 user1 in con1b
@@ -76,12 +52,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1c, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1c" as status;
 status
 user1 in con1c
@@ -103,12 +74,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2a, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2a" as status;
 status
 user2 in con2a
@@ -131,12 +97,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	1
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	1
-<<<<<<< HEAD
 connect  con2b, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2b" as status;
 status
 user2 in con2b
@@ -160,12 +121,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	2
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 connect  con2c, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2c" as status;
 status
 user2 in con2c
@@ -190,12 +146,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	3
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connect  con3a, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3a" as status;
 status
 user3 in con3a
@@ -221,12 +172,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	4
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	4
-<<<<<<< HEAD
 connect  con3b, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3b" as status;
 status
 user3 in con3b
@@ -253,12 +199,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	5
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	5
-<<<<<<< HEAD
 connect  con3c, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3c" as status;
 status
 user3 in con3c
@@ -286,13 +227,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-<<<<<<< HEAD
 connection default;
 disconnect con1a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1a disconnected" as status;
 status
 con1a disconnected
@@ -319,12 +255,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-<<<<<<< HEAD
 disconnect con2a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2a disconnected" as status;
 status
 con2a disconnected
@@ -350,12 +281,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-<<<<<<< HEAD
 disconnect con3a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3a disconnected" as status;
 status
 con3a disconnected
@@ -380,8 +306,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -404,8 +328,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -428,8 +350,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -452,12 +372,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	6
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	6
-<<<<<<< HEAD
 connect  con4a, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4a" as status;
 status
 user4 in con4a
@@ -483,12 +398,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	7
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	7
-<<<<<<< HEAD
 connect  con4b, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4b" as status;
 status
 user4 in con4b
@@ -515,12 +425,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	8
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	8
-<<<<<<< HEAD
 connect  con4c, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4c" as status;
 status
 user4 in con4c
@@ -548,13 +453,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 connection default;
 disconnect con1b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1b disconnected" as status;
 status
 con1b disconnected
@@ -581,12 +481,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 disconnect con2b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2b disconnected" as status;
 status
 con2b disconnected
@@ -612,12 +507,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 disconnect con3b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3b disconnected" as status;
 status
 con3b disconnected
@@ -642,12 +532,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 disconnect con1c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1c disconnected" as status;
 status
 con1c disconnected
@@ -671,12 +556,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 disconnect con2c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2c disconnected" as status;
 status
 con2c disconnected
@@ -699,12 +579,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 disconnect con3c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3c disconnected" as status;
 status
 con3c disconnected
@@ -726,8 +601,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -746,8 +619,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -765,8 +636,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -784,12 +653,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 connect  con5a, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5a" as status;
 status
 user5 in con5a
@@ -812,12 +676,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 connect  con5b, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5b" as status;
 status
 user5 in con5b
@@ -841,12 +700,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 connect  con5c, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5c" as status;
 status
 user5 in con5c
@@ -871,7 +725,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-<<<<<<< HEAD
 connection default;
 disconnect con4a;
 disconnect con4b;
@@ -879,10 +732,6 @@ disconnect con4c;
 disconnect con5a;
 disconnect con5b;
 disconnect con5c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
 status
 con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -901,8 +750,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -918,8 +765,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -934,8 +779,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -950,5 +793,3 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	9
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	9
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
diff --git a/mysql-test/suite/perfschema/r/connection_3u.result b/mysql-test/suite/perfschema/r/connection_3u.result
index 4d46959a7af..7bb5691c7f6 100644
--- a/mysql-test/suite/perfschema/r/connection_3u.result
+++ b/mysql-test/suite/perfschema/r/connection_3u.result
@@ -1,17 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 call dump_all();
 processlist_user	processlist_host
 root	localhost
@@ -25,12 +11,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1a, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1a" as status;
 status
 user1 in con1a
@@ -50,12 +31,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1b, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1b" as status;
 status
 user1 in con1b
@@ -76,12 +52,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con1c, localhost, user1, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user1 in con1c" as status;
 status
 user1 in con1c
@@ -103,12 +74,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	0
-<<<<<<< HEAD
 connect  con2a, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2a" as status;
 status
 user2 in con2a
@@ -132,12 +98,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	1
-<<<<<<< HEAD
 connect  con2b, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2b" as status;
 status
 user2 in con2b
@@ -162,12 +123,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	1
-<<<<<<< HEAD
 connect  con2c, localhost, user2, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user2 in con2c" as status;
 status
 user2 in con2c
@@ -193,12 +149,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	1
-<<<<<<< HEAD
 connect  con3a, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3a" as status;
 status
 user3 in con3a
@@ -226,12 +177,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 connect  con3b, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3b" as status;
 status
 user3 in con3b
@@ -260,12 +206,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 connect  con3c, localhost, user3, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user3 in con3c" as status;
 status
 user3 in con3c
@@ -295,13 +236,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 connection default;
 disconnect con1a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1a disconnected" as status;
 status
 con1a disconnected
@@ -330,12 +266,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 disconnect con2a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2a disconnected" as status;
 status
 con2a disconnected
@@ -363,12 +294,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 disconnect con3a;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3a disconnected" as status;
 status
 con3a disconnected
@@ -395,8 +321,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -421,8 +345,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -447,8 +369,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -473,12 +393,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	2
-<<<<<<< HEAD
 connect  con4a, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4a" as status;
 status
 user4 in con4a
@@ -507,12 +422,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connect  con4b, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4b" as status;
 status
 user4 in con4b
@@ -542,12 +452,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connect  con4c, localhost, user4, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user4 in con4c" as status;
 status
 user4 in con4c
@@ -578,13 +483,8 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connection default;
 disconnect con1b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1b disconnected" as status;
 status
 con1b disconnected
@@ -614,12 +514,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 disconnect con2b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2b disconnected" as status;
 status
 con2b disconnected
@@ -648,12 +543,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 disconnect con3b;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3b disconnected" as status;
 status
 con3b disconnected
@@ -681,12 +571,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 disconnect con1c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con1c disconnected" as status;
 status
 con1c disconnected
@@ -713,12 +598,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 disconnect con2c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con2c disconnected" as status;
 status
 con2c disconnected
@@ -744,12 +624,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 disconnect con3c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con3c disconnected" as status;
 status
 con3c disconnected
@@ -774,8 +649,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -795,8 +668,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -815,8 +686,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -835,12 +704,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connect  con5a, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5a" as status;
 status
 user5 in con5a
@@ -864,12 +728,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connect  con5b, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5b" as status;
 status
 user5 in con5b
@@ -894,12 +753,7 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connect  con5c, localhost, user5, , ;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "user5 in con5c" as status;
 status
 user5 in con5c
@@ -925,7 +779,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-<<<<<<< HEAD
 connection default;
 disconnect con4a;
 disconnect con4b;
@@ -933,10 +786,6 @@ disconnect con4c;
 disconnect con5a;
 disconnect con5b;
 disconnect con5c;
-=======
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
->>>>>>> merge-perfschema-5.7
 select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
 status
 con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -956,8 +805,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.hosts;
 call dump_all();
 processlist_user	processlist_host
@@ -973,8 +820,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.users;
 call dump_all();
 processlist_user	processlist_host
@@ -989,8 +834,6 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 truncate table performance_schema.accounts;
 call dump_all();
 processlist_user	processlist_host
@@ -1005,5 +848,3 @@ variable_name	variable_value
 PERFORMANCE_SCHEMA_ACCOUNTS_LOST	0
 PERFORMANCE_SCHEMA_HOSTS_LOST	0
 PERFORMANCE_SCHEMA_USERS_LOST	3
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
diff --git a/mysql-test/suite/perfschema/r/connection_type_notwin.result b/mysql-test/suite/perfschema/r/connection_type_notwin.result
index c859809cdf0..f8b6bfd0358 100644
--- a/mysql-test/suite/perfschema/r/connection_type_notwin.result
+++ b/mysql-test/suite/perfschema/r/connection_type_notwin.result
@@ -11,7 +11,8 @@ grant select on *.* to 'root'@'santa.claus.ipv4.example.com';
 create user 'rootssl'@'santa.claus.ipv4.example.com'
   require SSL;
 grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
-set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
+set @old_dbug=@@global.debug_dbug;
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 TRUNCATE TABLE mysql.general_log;
 SET @old_log_output=          @@global.log_output;
 SET @old_general_log=         @@global.general_log;
@@ -19,6 +20,7 @@ SET @old_general_log_file=    @@global.general_log_file;
 SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
+connect con1, localhost, root,,;
 "Connection con1"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -27,6 +29,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	localhost
 CONNECTION_TYPE	Socket
+disconnect con1;
+connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
 "Connection con2"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -35,6 +39,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
+disconnect con2;
+connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
 "Connection con3"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -43,6 +49,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	rootssl
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	SSL/TLS
+disconnect con3;
+connection default;
 SET GLOBAL general_log=       'OFF';
 CREATE TABLE test_log (argument TEXT);
 LOAD DATA LOCAL INFILE '.../log/rewrite_general_con.log'
@@ -67,7 +75,7 @@ DROP TABLE test_log;
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
-set global debug= default;
+set global debug_dbug= @old_dbug;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';
diff --git a/mysql-test/suite/perfschema/r/connection_type_win.result b/mysql-test/suite/perfschema/r/connection_type_win.result
index 1fa24c810c2..1852cefd483 100644
--- a/mysql-test/suite/perfschema/r/connection_type_win.result
+++ b/mysql-test/suite/perfschema/r/connection_type_win.result
@@ -11,7 +11,7 @@ grant select on *.* to 'root'@'santa.claus.ipv4.example.com';
 create user 'rootssl'@'santa.claus.ipv4.example.com'
   require SSL;
 grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
-set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 TRUNCATE TABLE mysql.general_log;
 SET @old_log_output=          @@global.log_output;
 SET @old_general_log=         @@global.general_log;
@@ -19,6 +19,7 @@ SET @old_general_log_file=    @@global.general_log_file;
 SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
+connect con1, localhost, root,,;
 "Connection con1"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -27,6 +28,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
+disconnect con1;
+connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
 "Connection con2"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -35,6 +38,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	root
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
+disconnect con2;
+connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
 "Connection con3"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
@@ -43,6 +48,8 @@ NAME	thread/sql/one_connection
 PROCESSLIST_USER	rootssl
 PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	SSL/TLS
+disconnect con3;
+connection default;
 SET GLOBAL general_log=       'OFF';
 CREATE TABLE test_log (argument TEXT);
 LOAD DATA LOCAL INFILE '.../log/rewrite_general_con.log'
@@ -67,7 +74,7 @@ DROP TABLE test_log;
 SET GLOBAL general_log_file=  @old_general_log_file;
 SET GLOBAL general_log=       @old_general_log;
 SET GLOBAL log_output=        @old_log_output;
-set global debug= default;
+set global debug_dbug= default;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';
diff --git a/mysql-test/suite/perfschema/r/csv_table_io.result b/mysql-test/suite/perfschema/r/csv_table_io.result
index 7fad123e35c..0e50dc24927 100644
--- a/mysql-test/suite/perfschema/r/csv_table_io.result
+++ b/mysql-test/suite/perfschema/r/csv_table_io.result
@@ -70,98 +70,51 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -170,17 +123,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/ddl_events_stages_current.result b/mysql-test/suite/perfschema/r/ddl_events_stages_current.result
index 137301234bb..bc5921d900a 100644
--- a/mysql-test/suite/perfschema/r/ddl_events_stages_current.result
+++ b/mysql-test/suite/perfschema/r/ddl_events_stages_current.result
@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_current ADD INDEX test_index(EVENT_
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_current(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	events_stages_current	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	performance_schema	events_stages_current	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_current	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
diff --git a/mysql-test/suite/perfschema/r/ddl_events_stages_history.result b/mysql-test/suite/perfschema/r/ddl_events_stages_history.result
index 7d30c7e8ff4..f099964b4df 100644
--- a/mysql-test/suite/perfschema/r/ddl_events_stages_history.result
+++ b/mysql-test/suite/perfschema/r/ddl_events_stages_history.result
@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_history ADD INDEX test_index(EVENT_
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	events_stages_history	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	performance_schema	events_stages_history	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
diff --git a/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result b/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result
index 84651664b96..f7f6d319564 100644
--- a/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/ddl_events_stages_history_long.result
@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_history_long ADD INDEX test_index(E
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history_long(EVENT_ID);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
+def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
diff --git a/mysql-test/suite/perfschema/r/ddl_global_variables.result b/mysql-test/suite/perfschema/r/ddl_global_variables.result
index 32422267266..e15b8166b2b 100644
--- a/mysql-test/suite/perfschema/r/ddl_global_variables.result
+++ b/mysql-test/suite/perfschema/r/ddl_global_variables.result
@@ -2,7 +2,7 @@ alter table performance_schema.global_variables
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.global_variables;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.global_variables
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_metadata_locks.result b/mysql-test/suite/perfschema/r/ddl_metadata_locks.result
index 4a7e11c63e0..426ec66943e 100644
--- a/mysql-test/suite/perfschema/r/ddl_metadata_locks.result
+++ b/mysql-test/suite/perfschema/r/ddl_metadata_locks.result
@@ -1,7 +1,7 @@
 alter table performance_schema.metadata_locks add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.metadata_locks;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.metadata_locks ADD INDEX test_index(TIMER_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.metadata_locks(TIMER_NAME);
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result b/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
index 6b6b9a988bc..db79022cbb4 100644
--- a/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_configuration
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_applier_configuration;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_applier_configuration
 ADD INDEX test_index(desired_delay);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result b/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result
index 99328acce5a..a6306e976ba 100644
--- a/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result
@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_status
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_applier_status;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_applier_status
 ADD INDEX test_index(remaining_delay);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result b/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
index 86bedb29451..414e8291ba8 100644
--- a/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_status_by_coordinator
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_applier_status_by_coordinator;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_applier_status_by_coordinator
 ADD INDEX test_index(thread_id);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result b/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result
index 8eea531a0c3..19de9281a13 100644
--- a/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result
+++ b/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result
@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_connection_configuration
 ADD COLUMN foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 TRUNCATE TABLE performance_schema.replication_connection_configuration;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.replication_connection_configuration
 ADD INDEX test_index(HOST);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_session_status.result b/mysql-test/suite/perfschema/r/ddl_session_status.result
index 39731f8a253..de5669a3a64 100644
--- a/mysql-test/suite/perfschema/r/ddl_session_status.result
+++ b/mysql-test/suite/perfschema/r/ddl_session_status.result
@@ -2,7 +2,7 @@ alter table performance_schema.session_status
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.session_status;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.session_status
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_session_variables.result b/mysql-test/suite/perfschema/r/ddl_session_variables.result
index 26bf8e1d2d7..add637059b7 100644
--- a/mysql-test/suite/perfschema/r/ddl_session_variables.result
+++ b/mysql-test/suite/perfschema/r/ddl_session_variables.result
@@ -2,7 +2,7 @@ alter table performance_schema.session_variables
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.session_variables;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.session_variables
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_table_handles.result b/mysql-test/suite/perfschema/r/ddl_table_handles.result
index 8c81ccad952..79b7c96e2a3 100644
--- a/mysql-test/suite/perfschema/r/ddl_table_handles.result
+++ b/mysql-test/suite/perfschema/r/ddl_table_handles.result
@@ -1,7 +1,7 @@
 alter table performance_schema.table_handles add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.table_handles;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.table_handles ADD INDEX test_index(TIMER_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.table_handles(TIMER_NAME);
diff --git a/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result b/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
index bb887a38122..b9961faa221 100644
--- a/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
+++ b/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
@@ -2,7 +2,7 @@ alter table performance_schema.user_variables_by_thread
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.user_variables_by_thread;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.user_variables_by_thread
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result b/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result
index c910de84c62..43e2f24f7fc 100644
--- a/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result
+++ b/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result
@@ -2,7 +2,7 @@ alter table performance_schema.variables_by_thread
 add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 truncate table performance_schema.variables_by_thread;
-ERROR HY000: Invalid performance_schema usage.
+ERROR HY000: Invalid performance_schema usage
 ALTER TABLE performance_schema.variables_by_thread
 ADD INDEX test_index(VARIABLE_NAME);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result
index f2a16620638..84a7b5c3c7c 100644
--- a/mysql-test/suite/perfschema/r/digest_table_full.result
+++ b/mysql-test/suite/perfschema/r/digest_table_full.result
@@ -111,17 +111,10 @@ DROP TRIGGER trg;
 ####################################
 SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
-<<<<<<< HEAD
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	55	32	1	2
 statements_digest	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
-SHOW VARIABLES LIKE "performance_schema_digests_size";
-=======
-SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-NULL	NULL	NULL	55	32	1	2
-statements_digest	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
 SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
->>>>>>> merge-perfschema-5.7
 Variable_name	Value
 performance_schema_digests_size	2
 SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;
diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result
index 3dd969528be..57d0f05cd8d 100644
--- a/mysql-test/suite/perfschema/r/dml_handler.result
+++ b/mysql-test/suite/perfschema/r/dml_handler.result
@@ -12,328 +12,198 @@ Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be
 # For each table in the performance schema, attempt HANDLER...OPEN,
 # which should fail with an error 1031, ER_ILLEGAL_HA.
 
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=87;
-HANDLER performance_schema.variables_by_thread OPEN;
-ERROR HY000: Table storage engine for 'variables_by_thread' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=86;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
+HANDLER performance_schema.user_variables_by_thread OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`user_variables_by_thread` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
 HANDLER performance_schema.users OPEN;
-<<<<<<< HEAD
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`users` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
 HANDLER performance_schema.threads OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`threads` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
 HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_lock_waits_summary_by_table` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
 HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_table` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
 HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_index_usage` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
+HANDLER performance_schema.table_handles OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_handles` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
+HANDLER performance_schema.status_by_user OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_user` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
+HANDLER performance_schema.status_by_thread OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_thread` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
+HANDLER performance_schema.status_by_host OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_host` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
+HANDLER performance_schema.status_by_account OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_account` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
 HANDLER performance_schema.socket_summary_by_instance OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_instance` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
 HANDLER performance_schema.socket_summary_by_event_name OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
 HANDLER performance_schema.socket_instances OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_instances` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
 HANDLER performance_schema.setup_timers OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_timers` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
 HANDLER performance_schema.setup_objects OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_objects` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
 HANDLER performance_schema.setup_instruments OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_instruments` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
 HANDLER performance_schema.setup_consumers OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_consumers` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
 HANDLER performance_schema.setup_actors OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_actors` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
+HANDLER performance_schema.session_status OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_status` doesn't have this option
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
 HANDLER performance_schema.session_connect_attrs OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_connect_attrs` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
 HANDLER performance_schema.session_account_connect_attrs OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_account_connect_attrs` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
 HANDLER performance_schema.rwlock_instances OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`rwlock_instances` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
-HANDLER performance_schema.performance_timers OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`performance_timers` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
-HANDLER performance_schema.objects_summary_global_by_type OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`objects_summary_global_by_type` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
-HANDLER performance_schema.mutex_instances OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
-HANDLER performance_schema.host_cache OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
-HANDLER performance_schema.hosts OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
-HANDLER performance_schema.file_summary_by_instance OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30;
-HANDLER performance_schema.file_summary_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29;
-HANDLER performance_schema.file_instances OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28;
-HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27;
-HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26;
-HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25;
-HANDLER performance_schema.events_waits_summary_by_instance OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24;
-HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23;
-HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22;
-HANDLER performance_schema.events_waits_history_long OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21;
-HANDLER performance_schema.events_waits_history OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20;
-HANDLER performance_schema.events_waits_current OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19;
-HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18;
-HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17;
-HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option
-=======
-ERROR HY000: Table storage engine for 'users' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=85;
-HANDLER performance_schema.user_variables_by_thread OPEN;
-ERROR HY000: Table storage engine for 'user_variables_by_thread' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=84;
-HANDLER performance_schema.threads OPEN;
-ERROR HY000: Table storage engine for 'threads' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=83;
-HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
-ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=82;
-HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
-ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=81;
-HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
-ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
-HANDLER performance_schema.table_handles OPEN;
-ERROR HY000: Table storage engine for 'table_handles' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
-HANDLER performance_schema.status_by_user OPEN;
-ERROR HY000: Table storage engine for 'status_by_user' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
-HANDLER performance_schema.status_by_thread OPEN;
-ERROR HY000: Table storage engine for 'status_by_thread' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
-HANDLER performance_schema.status_by_host OPEN;
-ERROR HY000: Table storage engine for 'status_by_host' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
-HANDLER performance_schema.status_by_account OPEN;
-ERROR HY000: Table storage engine for 'status_by_account' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
-HANDLER performance_schema.socket_summary_by_instance OPEN;
-ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
-HANDLER performance_schema.socket_summary_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
-HANDLER performance_schema.socket_instances OPEN;
-ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
-HANDLER performance_schema.setup_timers OPEN;
-ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
-HANDLER performance_schema.setup_objects OPEN;
-ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
-HANDLER performance_schema.setup_instruments OPEN;
-ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
-HANDLER performance_schema.setup_consumers OPEN;
-ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
-HANDLER performance_schema.setup_actors OPEN;
-ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
-HANDLER performance_schema.session_variables OPEN;
-ERROR HY000: Table storage engine for 'session_variables' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
-HANDLER performance_schema.session_status OPEN;
-ERROR HY000: Table storage engine for 'session_status' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
-HANDLER performance_schema.session_connect_attrs OPEN;
-ERROR HY000: Table storage engine for 'session_connect_attrs' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
-HANDLER performance_schema.session_account_connect_attrs OPEN;
-ERROR HY000: Table storage engine for 'session_account_connect_attrs' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
-HANDLER performance_schema.rwlock_instances OPEN;
-ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
-HANDLER performance_schema.replication_group_members OPEN;
-ERROR HY000: Table storage engine for 'replication_group_members' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
-HANDLER performance_schema.replication_group_member_stats OPEN;
-ERROR HY000: Table storage engine for 'replication_group_member_stats' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
-HANDLER performance_schema.replication_connection_status OPEN;
-ERROR HY000: Table storage engine for 'replication_connection_status' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
-HANDLER performance_schema.replication_connection_configuration OPEN;
-ERROR HY000: Table storage engine for 'replication_connection_configuration' doesn't have this option
-SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
-HANDLER performance_schema.replication_applier_status_by_worker OPEN;
-ERROR HY000: Table storage engine for 'replication_applier_status_by_worker' doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
-HANDLER performance_schema.replication_applier_status_by_coordinator OPEN;
-ERROR HY000: Table storage engine for 'replication_applier_status_by_coordinator' doesn't have this option
+HANDLER performance_schema.replication_connection_configuration OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_connection_configuration` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=56;
-HANDLER performance_schema.replication_applier_status OPEN;
-ERROR HY000: Table storage engine for 'replication_applier_status' doesn't have this option
+HANDLER performance_schema.replication_applier_status_by_coordinator OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_status_by_coordinator` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=55;
-HANDLER performance_schema.replication_applier_configuration OPEN;
-ERROR HY000: Table storage engine for 'replication_applier_configuration' doesn't have this option
+HANDLER performance_schema.replication_applier_status OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_status` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=54;
-HANDLER performance_schema.prepared_statements_instances OPEN;
-ERROR HY000: Table storage engine for 'prepared_statements_instances' doesn't have this option
+HANDLER performance_schema.replication_applier_configuration OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_configuration` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=53;
-HANDLER performance_schema.performance_timers OPEN;
-ERROR HY000: Table storage engine for 'performance_timers' doesn't have this option
+HANDLER performance_schema.prepared_statements_instances OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`prepared_statements_instances` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=52;
-HANDLER performance_schema.objects_summary_global_by_type OPEN;
-ERROR HY000: Table storage engine for 'objects_summary_global_by_type' doesn't have this option
+HANDLER performance_schema.performance_timers OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`performance_timers` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51;
-HANDLER performance_schema.mutex_instances OPEN;
-ERROR HY000: Table storage engine for 'mutex_instances' doesn't have this option
+HANDLER performance_schema.objects_summary_global_by_type OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`objects_summary_global_by_type` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
-HANDLER performance_schema.metadata_locks OPEN;
-ERROR HY000: Table storage engine for 'metadata_locks' doesn't have this option
+HANDLER performance_schema.mutex_instances OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
-HANDLER performance_schema.memory_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'memory_summary_global_by_event_name' doesn't have this option
+HANDLER performance_schema.metadata_locks OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`metadata_locks` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
-HANDLER performance_schema.memory_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'memory_summary_by_user_by_event_name' doesn't have this option
+HANDLER performance_schema.memory_summary_global_by_event_name OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_global_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
-HANDLER performance_schema.memory_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'memory_summary_by_thread_by_event_name' doesn't have this option
+HANDLER performance_schema.memory_summary_by_user_by_event_name OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_user_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
-HANDLER performance_schema.memory_summary_by_host_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'memory_summary_by_host_by_event_name' doesn't have this option
+HANDLER performance_schema.memory_summary_by_thread_by_event_name OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_thread_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
-HANDLER performance_schema.memory_summary_by_account_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'memory_summary_by_account_by_event_name' doesn't have this option
+HANDLER performance_schema.memory_summary_by_host_by_event_name OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_host_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
-HANDLER performance_schema.hosts OPEN;
-ERROR HY000: Table storage engine for 'hosts' doesn't have this option
+HANDLER performance_schema.memory_summary_by_account_by_event_name OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_account_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
 HANDLER performance_schema.host_cache OPEN;
-ERROR HY000: Table storage engine for 'host_cache' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
-HANDLER performance_schema.global_variables OPEN;
-ERROR HY000: Table storage engine for 'global_variables' doesn't have this option
+HANDLER performance_schema.hosts OPEN;
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
 HANDLER performance_schema.global_status OPEN;
-ERROR HY000: Table storage engine for 'global_status' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`global_status` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
 HANDLER performance_schema.file_summary_by_instance OPEN;
-ERROR HY000: Table storage engine for 'file_summary_by_instance' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
 HANDLER performance_schema.file_summary_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'file_summary_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
 HANDLER performance_schema.file_instances OPEN;
-ERROR HY000: Table storage engine for 'file_instances' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
 HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_global_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
 HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_user_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
 HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_thread_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
 HANDLER performance_schema.events_waits_summary_by_instance OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_instance' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
 HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_host_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
 HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_waits_summary_by_account_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
 HANDLER performance_schema.events_waits_history_long OPEN;
-ERROR HY000: Table storage engine for 'events_waits_history_long' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30;
 HANDLER performance_schema.events_waits_history OPEN;
-ERROR HY000: Table storage engine for 'events_waits_history' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29;
 HANDLER performance_schema.events_waits_current OPEN;
-ERROR HY000: Table storage engine for 'events_waits_current' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28;
 HANDLER performance_schema.events_transactions_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_summary_global_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_global_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27;
 HANDLER performance_schema.events_transactions_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_summary_by_user_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_user_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26;
 HANDLER performance_schema.events_transactions_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_summary_by_thread_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_thread_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25;
 HANDLER performance_schema.events_transactions_summary_by_host_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_summary_by_host_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_host_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24;
 HANDLER performance_schema.events_transactions_summary_by_account_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_summary_by_account_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_account_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23;
 HANDLER performance_schema.events_transactions_history_long OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_history_long' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_history_long` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22;
 HANDLER performance_schema.events_transactions_history OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_history' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_history` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21;
 HANDLER performance_schema.events_transactions_current OPEN;
-ERROR HY000: Table storage engine for 'events_transactions_current' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_current` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20;
 HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_global_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19;
 HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_user_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18;
 HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_thread_by_event_name' doesn't have this option
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17;
 HANDLER performance_schema.events_statements_summary_by_program OPEN;
-ERROR HY000: Table storage engine for 'events_statements_summary_by_program' doesn't have this option
->>>>>>> merge-perfschema-5.7
+ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_program` doesn't have this option
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=16;
 HANDLER performance_schema.events_statements_summary_by_host_by_event_name OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_host_by_event_name` doesn't have this option
diff --git a/mysql-test/suite/perfschema/r/dml_setup_actors.result b/mysql-test/suite/perfschema/r/dml_setup_actors.result
index 3aabbec9830..36be88fe850 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_actors.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_actors.result
@@ -42,10 +42,7 @@ set host='ILLEGAL';
 ERROR HY000: Invalid performance_schema usage
 update performance_schema.setup_actors
 set role='ILLEGAL';
-<<<<<<< HEAD
 ERROR HY000: Invalid performance_schema usage
-=======
-ERROR HY000: Invalid performance_schema usage.
 update performance_schema.setup_actors
 set ENABLED='YES';
 update performance_schema.setup_actors
@@ -71,7 +68,6 @@ ERROR 01000: Data truncated for column 'HISTORY' at row 1
 update performance_schema.setup_actors
 set HISTORY=NULL;
 ERROR 23000: Column 'HISTORY' cannot be null
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_actors
 order by USER, HOST;
 HOST	USER	ROLE	ENABLED	HISTORY
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
index 8597387d784..27b744977dd 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -4,35 +4,16 @@ where name like 'Wait/Synch/Mutex/sql/%'
   and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex')
 order by name limit 10;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
 wait/synch/mutex/sql/Ack_receiver::mutex	YES	YES
 wait/synch/mutex/sql/Cversion_lock	YES	YES
 wait/synch/mutex/sql/Delayed_insert::mutex	YES	YES
-=======
-wait/synch/mutex/sql/Commit_order_manager::m_mutex	YES	YES
-wait/synch/mutex/sql/Cost_constant_cache::LOCK_cost_const	YES	YES
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state	YES	YES
-<<<<<<< HEAD
 wait/synch/mutex/sql/gtid_waiting::LOCK_gtid_waiting	YES	YES
 wait/synch/mutex/sql/hash_filo::lock	YES	YES
 wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc	YES	YES
 wait/synch/mutex/sql/LOCK_active_mi	YES	YES
 wait/synch/mutex/sql/LOCK_after_binlog_sync	YES	YES
 wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
-<<<<<<< HEAD
-=======
-wait/synch/mutex/sql/LOCK_binlog_state	YES	YES
-=======
-wait/synch/mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex	YES	YES
-wait/synch/mutex/sql/Gtid_state	YES	YES
-wait/synch/mutex/sql/hash_filo::lock	YES	YES
-wait/synch/mutex/sql/key_mts_gaq_LOCK	YES	YES
-wait/synch/mutex/sql/key_mts_temp_table_LOCK	YES	YES
-wait/synch/mutex/sql/LOCK_audit_mask	YES	YES
-wait/synch/mutex/sql/LOCK_compress_gtid_table	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Rwlock/sql/%'
   and name not in (
@@ -40,11 +21,7 @@ where name like 'Wait/Synch/Rwlock/sql/%'
 'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
 order by name limit 10;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_all_status_vars	YES	YES
-=======
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_dboptions	YES	YES
 wait/synch/rwlock/sql/LOCK_grant	YES	YES
 wait/synch/rwlock/sql/LOCK_SEQUENCE	YES	YES
@@ -54,24 +31,6 @@ wait/synch/rwlock/sql/LOCK_sys_init_connect	YES	YES
 wait/synch/rwlock/sql/LOCK_sys_init_slave	YES	YES
 wait/synch/rwlock/sql/LOGGER::LOCK_logger	YES	YES
 wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for	YES	YES
-<<<<<<< HEAD
-=======
-wait/synch/rwlock/sql/MDL_lock::rwlock	YES	YES
-wait/synch/rwlock/sql/Query_cache_query::lock	YES	YES
-wait/synch/rwlock/sql/THR_LOCK_servers	YES	YES
-=======
-wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock	YES	YES
-wait/synch/rwlock/sql/Binlog_storage_delegate::lock	YES	YES
-wait/synch/rwlock/sql/Binlog_transmit_delegate::lock	YES	YES
-wait/synch/rwlock/sql/channel_lock	YES	YES
-wait/synch/rwlock/sql/channel_map_lock	YES	YES
-wait/synch/rwlock/sql/gtid_commit_rollback	YES	YES
-wait/synch/rwlock/sql/gtid_mode_lock	YES	YES
-wait/synch/rwlock/sql/LOCK_dboptions	YES	YES
-wait/synch/rwlock/sql/LOCK_grant	YES	YES
-wait/synch/rwlock/sql/LOCK_system_variables_hash	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Cond/sql/%'
   and name not in (
@@ -82,17 +41,8 @@ where name like 'Wait/Synch/Cond/sql/%'
 'wait/synch/cond/sql/COND_start_signal_handler')
 order by name limit 10;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
 wait/synch/cond/sql/Ack_receiver::cond	YES	YES
 wait/synch/cond/sql/COND_binlog_send	YES	YES
-=======
-<<<<<<< HEAD
-=======
-wait/synch/cond/sql/Commit_order_manager::m_workers.cond	YES	YES
-wait/synch/cond/sql/COND_compress_gtid_table	YES	YES
-wait/synch/cond/sql/COND_connection_count	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/cond/sql/COND_flush_thread_cache	YES	YES
 wait/synch/cond/sql/COND_group_commit_orderer	YES	YES
 wait/synch/cond/sql/COND_gtid_ignore_duplicates	YES	YES
@@ -100,19 +50,7 @@ wait/synch/cond/sql/COND_manager	YES	YES
 wait/synch/cond/sql/COND_parallel_entry	YES	YES
 wait/synch/cond/sql/COND_prepare_ordered	YES	YES
 wait/synch/cond/sql/COND_queue_state	YES	YES
-<<<<<<< HEAD
 wait/synch/cond/sql/COND_rpl_thread	YES	YES
-<<<<<<< HEAD
-=======
-wait/synch/cond/sql/COND_rpl_thread_pool	YES	YES
-wait/synch/cond/sql/COND_rpl_thread_queue	YES	YES
-=======
-wait/synch/cond/sql/COND_server_started	YES	YES
-wait/synch/cond/sql/COND_thd_list	YES	YES
-wait/synch/cond/sql/COND_thread_cache	YES	YES
-wait/synch/cond/sql/COND_thr_lock	YES	YES
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select * from performance_schema.setup_instruments
 where name='Wait';
 select * from performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/dml_setup_objects.result b/mysql-test/suite/perfschema/r/dml_setup_objects.result
index a10c8c7e845..f1ad2ff68a0 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_objects.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_objects.result
@@ -1,7 +1,5 @@
 drop table if exists test.setup_objects;
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create table test.setup_objects as
 select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result
index 0c2ce5c726f..ed6d30bab10 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result
@@ -1,23 +1,23 @@
 update performance_schema.setup_timers
 set timer_name='CYCLE' where name="wait";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="stage";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="statement";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="transaction";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="idle";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MICROSECOND
@@ -26,19 +26,19 @@ stage	NANOSECOND
 statement	NANOSECOND
 transaction	MICROSECOND
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers
 where name='Wait';
 NAME	TIMER_NAME
 wait	CYCLE
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers
 where timer_name='CYCLE';
 NAME	TIMER_NAME
 wait	CYCLE
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 insert into performance_schema.setup_timers
 set name='FOO', timer_name='CYCLE';
 ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
@@ -48,7 +48,7 @@ ERROR HY000: Invalid performance_schema usage
 update performance_schema.setup_timers
 set timer_name='MILLISECOND';
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MILLISECOND
@@ -57,11 +57,11 @@ stage	MILLISECOND
 statement	MILLISECOND
 transaction	MILLISECOND
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='CYCLE';
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 delete from performance_schema.setup_timers;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
 delete from performance_schema.setup_timers
@@ -74,23 +74,23 @@ UNLOCK TABLES;
 update performance_schema.setup_timers
 set timer_name='CYCLE' where name="wait";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="stage";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='NANOSECOND' where name="statement";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="transaction";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 update performance_schema.setup_timers
 set timer_name='MICROSECOND' where name="idle";
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MICROSECOND
@@ -99,4 +99,4 @@ stage	NANOSECOND
 statement	NANOSECOND
 transaction	MICROSECOND
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result
index 870880fd539..2582262c8c4 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -27,22 +15,10 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -52,18 +28,16 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -115,12 +89,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -131,76 +99,48 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 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/Init for update	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/Opening tables	0
 user1	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
 user1	stage/sql/starting	0
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -260,45 +200,25 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -307,144 +227,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	4
-=======
 localhost	wait/io/file/sql/query_log	7
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-execute dump_stages_user;
-user	event_name	count_star
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-execute dump_stages_host;
-host	event_name	count_star
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -509,27 +344,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -537,180 +355,73 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-=======
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	5
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
 user2	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	localhost	stage/sql/Opening tables	0
 user2	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-user2	stage/sql/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
 user2	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	stage/sql/Opening tables	0
 user2	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -784,237 +495,101 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	8
-=======
 localhost	wait/io/file/sql/query_log	14
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1093,254 +668,99 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-=======
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	9
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	15
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	0
 user3	localhost	stage/sql/closing tables	0
 user3	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	localhost	stage/sql/Opening tables	0
 user3	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	0
 user3	stage/sql/closing tables	0
 user3	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	stage/sql/Opening tables	0
 user3	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1428,283 +848,116 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	12
-=======
 localhost	wait/io/file/sql/query_log	21
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1797,300 +1050,114 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_account;
-user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-=======
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	13
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	22
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2192,329 +1259,131 @@ user4	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	16
-=======
 localhost	wait/io/file/sql/query_log	28
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	20
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	24
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2623,294 +1492,111 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	17
-=======
 localhost	wait/io/file/sql/query_log	29
-localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	21
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	25
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3022,280 +1708,108 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	18
-=======
 localhost	wait/io/file/sql/query_log	30
-localhost	wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	22
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	26
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3409,266 +1923,105 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	19
-=======
 localhost	wait/io/file/sql/query_log	31
-localhost	wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	23
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	27
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3785,251 +2138,101 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4147,251 +2350,101 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4509,245 +2562,100 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4865,240 +2773,100 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5216,235 +2984,100 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/file/sql/query_log	20
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5562,230 +3195,100 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5903,230 +3406,100 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6244,122 +3617,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6374,96 +3666,51 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6581,122 +3828,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6711,32 +3877,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6751,52 +3899,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6914,122 +4039,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -7044,32 +4088,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7084,46 +4110,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7241,122 +4250,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -7371,32 +4299,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7411,40 +4321,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7562,86 +4461,35 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -7703,9 +4551,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7824,61 +4672,35 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -7940,9 +4762,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8061,61 +4883,35 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8177,9 +4973,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8298,61 +5094,35 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8414,9 +5184,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8535,61 +5305,35 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8651,9 +5395,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8772,97 +5516,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -8877,32 +5565,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -8917,40 +5587,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -9068,122 +5727,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -9198,32 +5776,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -9238,40 +5798,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -9389,119 +5938,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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/Init for update	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/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -9516,32 +5987,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -9556,40 +6009,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -9707,119 +6149,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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/Init for update	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/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -9834,32 +6198,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -9874,40 +6220,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -10025,119 +6360,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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/Init for update	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/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -10152,32 +6409,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -10192,40 +6431,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -10345,90 +6573,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -10443,40 +6614,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -10570,69 +6730,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -10698,72 +6829,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
index e3acb02e4e3..b67cd3ee31c 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -27,22 +15,10 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -52,18 +28,16 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -114,12 +88,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -132,32 +100,14 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -166,26 +116,23 @@ 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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
 user1	stage/sql/starting	0
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -237,45 +184,25 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -286,117 +213,50 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	4
-=======
 localhost	wait/io/file/sql/query_log	7
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	1
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-execute dump_stages_host;
-host	event_name	count_star
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -453,27 +313,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -483,135 +326,57 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	5
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-user2	stage/sql/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
 user2	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	stage/sql/Opening tables	0
 user2	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -670,59 +435,28 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
@@ -731,134 +465,57 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	8
-=======
 localhost	wait/io/file/sql/query_log	14
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -922,41 +579,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -964,152 +593,64 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	9
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	15
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	0
 user3	stage/sql/closing tables	0
 user3	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	stage/sql/Opening tables	0
 user3	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1175,224 +716,95 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	12
-=======
 localhost	wait/io/file/sql/query_log	21
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1463,223 +875,86 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	13
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	22
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1752,253 +1027,103 @@ user4	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	16
-=======
 localhost	wait/io/file/sql/query_log	28
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	20
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	24
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2078,218 +1203,83 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	17
-=======
 localhost	wait/io/file/sql/query_log	29
-localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	21
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	25
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2372,204 +1362,80 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	18
-=======
 localhost	wait/io/file/sql/query_log	30
-localhost	wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	22
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	26
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2654,190 +1520,77 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	19
-=======
 localhost	wait/io/file/sql/query_log	31
-localhost	wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	23
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	27
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2927,173 +1680,71 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3184,173 +1835,71 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3440,173 +1989,71 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3697,167 +2144,70 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3948,162 +2298,70 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/file/sql/query_log	20
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4194,157 +2452,70 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4435,157 +2606,70 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4676,157 +2760,70 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	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	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
 execute dump_stages_host;
 host	event_name	count_star
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4917,93 +2914,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5018,52 +2955,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5154,93 +3068,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5255,46 +3109,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5385,93 +3222,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5486,40 +3263,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5610,93 +3376,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5711,40 +3417,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5835,93 +3530,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5936,40 +3571,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6060,93 +3684,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6161,40 +3725,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6285,93 +3838,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6386,40 +3879,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6510,93 +3992,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6611,40 +4033,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6735,43 +4146,25 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6813,9 +4206,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6907,43 +4300,25 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6985,9 +4360,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7079,43 +4454,25 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7157,9 +4514,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7251,39 +4608,25 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7325,9 +4668,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7419,39 +4762,25 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7493,9 +4822,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7587,90 +4916,33 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7685,40 +4957,29 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	0
-localhost	stage/sql/Closing tables	0
-localhost	stage/sql/Init	0
-localhost	stage/sql/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -7811,69 +5072,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -7938,69 +5170,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
index 8565f759bea..76f183fa43d 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -29,12 +17,6 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -46,10 +28,9 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -93,12 +74,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -111,24 +86,12 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -137,20 +100,18 @@ 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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
 user1	stage/sql/starting	0
 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -195,45 +156,25 @@ root	1	1
 user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -244,93 +185,43 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	1
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -380,27 +271,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -410,110 +284,50 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-user2	stage/sql/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
 user2	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	stage/sql/Opening tables	0
 user2	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -565,59 +379,28 @@ user1	1	1
 user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
@@ -626,110 +409,50 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -786,41 +509,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -828,127 +523,57 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
-wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	0
 user3	stage/sql/closing tables	0
 user3	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	stage/sql/Opening tables	0
 user3	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1007,200 +632,88 @@ user2	1	1
 user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	4
-user3	stage/sql/Init	5
-user3	stage/sql/Init for update	1
-user3	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1264,198 +777,79 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1521,229 +915,96 @@ user3	1	1
 user4	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1816,194 +1077,76 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2079,180 +1222,73 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2330,166 +1366,70 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2572,149 +1512,64 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2798,149 +1653,64 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3023,149 +1793,64 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3249,143 +1934,63 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3469,143 +2074,63 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3689,138 +2214,63 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3904,138 +2354,63 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4119,138 +2494,63 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4334,85 +2634,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -4427,40 +2673,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4544,85 +2774,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -4637,40 +2813,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4754,85 +2914,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -4847,34 +2953,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4958,85 +3054,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5051,34 +3093,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5162,85 +3194,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5255,34 +3233,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5366,85 +3334,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5459,34 +3373,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5570,85 +3474,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5663,34 +3513,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5774,85 +3614,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -5867,34 +3653,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5978,85 +3754,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6071,34 +3793,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6182,47 +3894,23 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6251,27 +3939,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6355,47 +4034,23 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6424,25 +4079,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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6527,35 +4174,23 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6592,11 +4227,10 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -6680,35 +4314,23 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6745,9 +4367,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6832,35 +4454,23 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6897,9 +4507,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6988,15 +4598,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7013,9 +4619,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7076,15 +4682,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7101,9 +4703,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 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 c46b128a943..d5d8e96dd64 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -27,22 +15,10 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -52,18 +28,16 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -113,12 +87,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -133,22 +101,10 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -159,18 +115,16 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -214,45 +168,25 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -265,90 +199,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	4
-=======
 localhost	wait/io/file/sql/query_log	7
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -397,27 +282,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -429,90 +297,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	5
-=======
 localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -556,59 +375,28 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
@@ -619,90 +407,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	8
-=======
 localhost	wait/io/file/sql/query_log	14
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -751,41 +490,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -795,90 +506,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	9
-=======
 localhost	wait/io/file/sql/query_log	15
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -922,73 +584,31 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
@@ -997,90 +617,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	12
-=======
 localhost	wait/io/file/sql/query_log	21
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1129,55 +700,16 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -1185,90 +717,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	13
-=======
 localhost	wait/io/file/sql/query_log	22
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1312,177 +795,75 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	16
-=======
 localhost	wait/io/file/sql/query_log	28
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	20
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	24
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1533,142 +914,55 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	17
-=======
 localhost	wait/io/file/sql/query_log	29
-localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	21
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	25
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1722,128 +1016,52 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	18
-=======
 localhost	wait/io/file/sql/query_log	30
-localhost	wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	22
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	26
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1899,114 +1117,49 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	19
-=======
 localhost	wait/io/file/sql/query_log	31
-localhost	wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	23
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	27
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2069,95 +1222,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2221,95 +1320,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2372,95 +1417,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2523,95 +1514,41 @@ execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2675,89 +1612,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/file/sql/query_log	20
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2821,84 +1709,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2962,84 +1806,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3103,84 +1903,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3244,84 +2000,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3385,78 +2097,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3520,72 +2194,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3649,72 +2291,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3778,72 +2388,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3907,72 +2485,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4036,72 +2582,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4165,72 +2679,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4294,69 +2776,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4420,69 +2873,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4546,69 +2970,40 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4672,21 +3067,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -4708,9 +3097,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4775,21 +3164,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -4811,9 +3194,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4878,25 +3261,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -4918,9 +3291,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -4985,25 +3358,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -5025,9 +3388,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -5092,25 +3455,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -5132,9 +3485,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 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 4beac471bdd..ce23077d4bd 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -29,12 +17,6 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -46,10 +28,9 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -92,12 +73,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -114,12 +89,6 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -132,10 +101,9 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -172,45 +140,25 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -225,28 +173,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	1
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -255,33 +187,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -323,27 +240,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -357,28 +257,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -387,33 +271,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -450,59 +319,28 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
@@ -515,28 +353,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
-wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -545,33 +367,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -613,41 +420,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -659,28 +438,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
-wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -689,33 +452,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -752,73 +500,31 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
@@ -829,28 +535,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -859,33 +549,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -927,55 +602,16 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -985,28 +621,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	13
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1015,33 +635,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1078,87 +683,34 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
@@ -1167,28 +719,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1197,33 +733,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1267,47 +788,14 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
@@ -1316,33 +804,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1351,33 +818,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1424,33 +876,11 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
@@ -1459,33 +889,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1494,33 +903,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1569,19 +963,8 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
@@ -1590,33 +973,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1625,33 +987,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1709,33 +1056,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1744,33 +1070,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1829,33 +1140,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1864,33 +1154,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1948,33 +1223,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -1983,33 +1237,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2067,33 +1306,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2102,33 +1320,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2186,33 +1389,12 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2221,33 +1403,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2306,27 +1473,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2335,33 +1486,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2420,27 +1556,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2449,33 +1569,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2534,27 +1639,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2563,33 +1652,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2648,27 +1722,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2677,33 +1735,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2762,27 +1805,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2791,33 +1818,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2876,27 +1888,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -2905,27 +1901,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2984,27 +1971,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3013,27 +1984,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3092,27 +2054,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3121,27 +2067,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3200,27 +2137,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3229,27 +2150,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3308,27 +2220,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3337,27 +2233,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3416,27 +2303,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3445,25 +2316,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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3523,15 +2386,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3548,9 +2407,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3610,15 +2469,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3635,11 +2490,10 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3698,15 +2552,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3723,9 +2573,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3785,15 +2635,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3810,9 +2656,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3872,15 +2718,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3897,9 +2739,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -3959,27 +2801,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -3988,27 +2814,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4067,27 +2884,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -4096,27 +2897,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4175,27 +2967,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -4204,27 +2980,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
index 180a6b5e385..a74b0288cd7 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -29,12 +17,6 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -46,10 +28,9 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -94,12 +75,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -110,62 +85,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 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/Init for update	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/Opening tables	0
 user1	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
 user1	stage/sql/starting	0
 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -218,45 +172,25 @@ root	1	1
 user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -265,120 +199,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	1
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-execute dump_stages_user;
-user	event_name	count_star
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -436,27 +302,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -464,155 +313,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-=======
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
 user2	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	localhost	stage/sql/Opening tables	0
 user2	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-user2	stage/sql/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
 user2	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	stage/sql/Opening tables	0
 user2	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -679,213 +439,94 @@ user1	1	1
 user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -957,229 +598,92 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-=======
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	0
 user3	localhost	stage/sql/closing tables	0
 user3	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	localhost	stage/sql/Opening tables	0
 user3	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	0
 user3	stage/sql/closing tables	0
 user3	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	stage/sql/Opening tables	0
 user3	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1260,259 +764,109 @@ user2	1	1
 user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	4
-user3	stage/sql/Init	5
-user3	stage/sql/Init for update	1
-user3	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1598,275 +952,107 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_account;
-user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-=======
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1961,305 +1147,124 @@ user3	1	1
 user4	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	16
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	5
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	6
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2361,270 +1366,104 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	6
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2729,256 +1568,101 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	6
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3085,242 +1769,98 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	5
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3430,227 +1970,94 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3761,227 +2168,94 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	5
-=======
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4092,221 +2366,93 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	8
-user1	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-user2	wait/io/file/sql/query_log	5
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	1
-user3	wait/io/file/sql/query_log	5
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	1
-user4	wait/io/file/sql/query_log	5
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
 user2	wait/io/file/sql/query_log	8
-user2	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
+user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	8
-user3	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
+user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	8
-user4	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4417,216 +2563,93 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4737,216 +2760,93 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5057,211 +2957,93 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5372,211 +3154,93 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	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	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
 execute dump_stages_user;
 user	event_name	count_star
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5687,114 +3351,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5809,85 +3398,46 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	stage/sql/Checking permissions	3
-user1	stage/sql/Closing tables	6
-user1	stage/sql/Init	6
-user1	stage/sql/Init for update	1
-user1	stage/sql/Opening tables	4
-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	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	4
-user4	stage/sql/Init	6
-user4	stage/sql/Init for update	1
-user4	stage/sql/Opening tables	3
-=======
 user1	stage/sql/checking permissions	4
-user1	stage/sql/closing tables	6
-user1	stage/sql/init	4
-user1	stage/sql/Opening tables	6
+user1	stage/sql/closing tables	13
+user1	stage/sql/init	3
+user1	stage/sql/Opening tables	7
 user1	stage/sql/starting	7
 user2	stage/sql/checking permissions	4
-user2	stage/sql/closing tables	6
-user2	stage/sql/init	4
+user2	stage/sql/closing tables	11
+user2	stage/sql/init	3
 user2	stage/sql/Opening tables	6
 user2	stage/sql/starting	7
 user3	stage/sql/checking permissions	4
-user3	stage/sql/closing tables	6
-user3	stage/sql/init	4
+user3	stage/sql/closing tables	11
+user3	stage/sql/init	3
 user3	stage/sql/Opening tables	6
 user3	stage/sql/starting	7
 user4	stage/sql/checking permissions	4
-user4	stage/sql/closing tables	6
-user4	stage/sql/init	4
+user4	stage/sql/closing tables	11
+user4	stage/sql/init	3
 user4	stage/sql/Opening tables	6
 user4	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5998,114 +3548,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6120,32 +3595,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6160,40 +3617,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6304,114 +3745,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6426,32 +3792,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6466,40 +3814,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6610,114 +3942,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6732,32 +3989,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -6772,34 +4011,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6910,114 +4139,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -7032,32 +4186,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7072,34 +4208,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7210,111 +4336,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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/Init for update	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/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -7329,32 +4383,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7369,34 +4405,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7507,111 +4533,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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/Init for update	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/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -7626,32 +4580,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7666,34 +4602,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7804,111 +4730,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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/Init for update	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/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -7923,32 +4777,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -7963,34 +4799,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -8101,78 +4927,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8229,9 +5010,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8343,53 +5124,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8446,9 +5207,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8560,57 +5321,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8667,9 +5404,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -8781,57 +5518,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -8888,9 +5601,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -9002,89 +5715,39 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -9099,32 +5762,14 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+user1	stage/sql/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -9139,32 +5784,23 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -9276,57 +5912,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -9383,11 +5995,10 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -9500,85 +6111,31 @@ user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
 user1	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	wait/synch/rwlock/sql/LOCK_grant	0
-user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	wait/synch/rwlock/sql/LOCK_grant	0
-user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	wait/synch/rwlock/sql/LOCK_grant	0
-user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 user2	wait/io/file/sql/query_log	0
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 user3	wait/io/file/sql/query_log	0
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 user4	wait/io/file/sql/query_log	0
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
 user	event_name	count_star
-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/checking permissions	0
+user1	stage/sql/closing tables	0
+user1	stage/sql/init	0
 user1	stage/sql/Opening tables	0
-<<<<<<< HEAD
-user2	stage/sql/Checking permissions	0
-user2	stage/sql/Closing tables	0
-user2	stage/sql/Init	0
-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/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/Init for update	0
-=======
 user1	stage/sql/starting	0
 user2	stage/sql/checking permissions	0
 user2	stage/sql/closing tables	0
@@ -9593,34 +6150,24 @@ user3	stage/sql/starting	0
 user4	stage/sql/checking permissions	0
 user4	stage/sql/closing tables	0
 user4	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	stage/sql/Opening tables	0
 user4	stage/sql/starting	0
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -9709,27 +6256,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -9738,27 +6269,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -9819,27 +6341,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -9848,27 +6354,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
index ffca46229f7..c9c5ed2aebd 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -27,22 +15,10 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -52,18 +28,16 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -114,12 +88,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -130,62 +98,41 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 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/Init for update	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/Opening tables	0
 user1	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -237,45 +184,25 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -284,120 +211,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	4
-=======
 localhost	wait/io/file/sql/query_log	7
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -454,27 +313,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -482,137 +324,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	5
-=======
 localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
 user2	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	localhost	stage/sql/Opening tables	0
 user2	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 localhost	stage/sql/checking permissions	4
-localhost	stage/sql/closing tables	6
-localhost	stage/sql/init	4
-localhost	stage/sql/Opening tables	6
+localhost	stage/sql/closing tables	13
+localhost	stage/sql/init	3
+localhost	stage/sql/Opening tables	7
 localhost	stage/sql/starting	6
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -671,196 +435,87 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	8
-=======
 localhost	wait/io/file/sql/query_log	14
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -924,194 +579,78 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	9
-=======
 localhost	wait/io/file/sql/query_log	15
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	4
-localhost	wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	9
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	0
 user3	localhost	stage/sql/closing tables	0
 user3	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	localhost	stage/sql/Opening tables	0
 user3	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 localhost	stage/sql/checking permissions	8
-localhost	stage/sql/closing tables	12
-localhost	stage/sql/init	8
-localhost	stage/sql/Opening tables	12
+localhost	stage/sql/closing tables	24
+localhost	stage/sql/init	6
+localhost	stage/sql/Opening tables	13
 localhost	stage/sql/starting	12
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1177,225 +716,95 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	12
-=======
 localhost	wait/io/file/sql/query_log	21
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	4
-user3	localhost	stage/sql/Init	5
-user3	localhost	stage/sql/Init for update	1
-user3	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1466,223 +875,86 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_account;
-user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	13
-=======
 localhost	wait/io/file/sql/query_log	22
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	6
-localhost	wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 localhost	stage/sql/checking permissions	12
-localhost	stage/sql/closing tables	18
-localhost	stage/sql/init	12
-localhost	stage/sql/Opening tables	18
+localhost	stage/sql/closing tables	35
+localhost	stage/sql/init	9
+localhost	stage/sql/Opening tables	19
 localhost	stage/sql/starting	18
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1755,254 +1027,103 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	16
-=======
 localhost	wait/io/file/sql/query_log	28
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	20
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	24
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2082,219 +1203,83 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	17
-=======
 localhost	wait/io/file/sql/query_log	29
-localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	21
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	25
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2377,205 +1362,80 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	18
-=======
 localhost	wait/io/file/sql/query_log	30
-localhost	wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	22
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	26
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2660,191 +1520,77 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	19
-=======
 localhost	wait/io/file/sql/query_log	31
-localhost	wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	23
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	27
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2932,176 +1678,73 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3190,176 +1833,73 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3448,170 +1988,72 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3700,170 +2142,72 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/file/sql/query_log	20
-=======
 localhost	wait/io/file/sql/query_log	32
-localhost	wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
-=======
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	8
-localhost	wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3952,165 +2296,72 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-localhost	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/file/sql/query_log	20
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4199,160 +2450,72 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4441,160 +2604,72 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4683,93 +2758,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -4784,54 +2799,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4920,93 +2912,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5021,54 +2953,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
-execute dump_stages_global;
-event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 localhost	stage/sql/checking permissions	16
-localhost	stage/sql/closing tables	24
-localhost	stage/sql/init	16
-localhost	stage/sql/Opening tables	24
+localhost	stage/sql/closing tables	46
+localhost	stage/sql/init	12
+localhost	stage/sql/Opening tables	25
 localhost	stage/sql/starting	28
 execute dump_stages_global;
 event_name	count_star
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5157,93 +3066,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5258,48 +3107,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5388,93 +3220,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5489,42 +3261,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5613,93 +3374,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5714,42 +3415,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5838,93 +3528,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5939,42 +3569,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6063,93 +3682,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6164,42 +3723,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6288,93 +3836,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6389,42 +3877,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6513,93 +3990,33 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -6614,42 +4031,31 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6737,61 +4143,28 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-=======
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -6818,35 +4191,25 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6935,57 +4298,27 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -7012,35 +4345,25 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7129,57 +4452,27 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -7206,35 +4499,25 @@ 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/Init for update	0
+localhost	stage/sql/checking permissions	0
+localhost	stage/sql/closing tables	0
+localhost	stage/sql/init	0
 localhost	stage/sql/Opening tables	0
 localhost	stage/sql/starting	0
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	0
-stage/sql/Closing tables	0
-stage/sql/Init	0
-stage/sql/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -7323,41 +4606,27 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -7399,9 +4668,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7491,41 +4760,27 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -7567,9 +4822,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7663,21 +4918,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7699,9 +4948,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7767,21 +5016,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7803,9 +5046,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -7871,21 +5114,15 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -7907,9 +5144,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 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 d3943ebbff9..671125191f8 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -29,12 +17,6 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -46,10 +28,9 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -93,12 +74,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -109,12 +84,6 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -123,22 +92,15 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 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/Init for update	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/Opening tables	0
 user1	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -147,10 +109,9 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
@@ -195,45 +156,25 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con1 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user2	not found
 username	status
@@ -242,95 +183,45 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	4
-=======
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	1
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	4
 wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	7
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -380,27 +271,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -408,26 +282,9 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -435,50 +292,22 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	5
-=======
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
-wait/synch/rwlock/sql/LOCK_grant	1
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_uuid_generator	2
-wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
 user2	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user2	localhost	stage/sql/Opening tables	0
 user2	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -487,33 +316,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	6
-stage/sql/Init	5
-stage/sql/Init for update	1
-stage/sql/Opening tables	4
-=======
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	4
-stage/sql/closing tables	6
-stage/sql/init	4
-stage/sql/Opening tables	6
+stage/sql/closing tables	13
+stage/sql/init	3
+stage/sql/Opening tables	7
 stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -565,171 +379,80 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con2 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	8
-=======
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	2
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	14
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -786,73 +509,23 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -860,60 +533,27 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	9
-=======
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
-wait/synch/rwlock/sql/LOCK_grant	2
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	15
-wait/synch/mutex/sql/LOCK_uuid_generator	4
-wait/synch/rwlock/sql/LOCK_grant	4
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	0
 user3	localhost	stage/sql/closing tables	0
 user3	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user3	localhost	stage/sql/Opening tables	0
 user3	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -922,33 +562,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	10
-stage/sql/Init	10
-stage/sql/Init for update	2
-stage/sql/Opening tables	7
-=======
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	8
-stage/sql/closing tables	12
-stage/sql/init	8
-stage/sql/Opening tables	12
+stage/sql/closing tables	24
+stage/sql/init	6
+stage/sql/Opening tables	13
 stage/sql/starting	12
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1007,200 +632,88 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con3 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	12
-=======
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	3
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	12
 wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	21
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	4
-user3	localhost	stage/sql/Init	5
-user3	localhost	stage/sql/Init for update	1
-user3	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1264,92 +777,26 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_account;
-user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-=======
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-<<<<<<< HEAD
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -1357,70 +804,32 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	13
-=======
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
-wait/synch/rwlock/sql/LOCK_grant	3
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	22
-wait/synch/mutex/sql/LOCK_uuid_generator	6
-wait/synch/rwlock/sql/LOCK_grant	6
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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/Init for update	0
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -1429,33 +838,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	14
-stage/sql/Init	15
-stage/sql/Init for update	3
-stage/sql/Opening tables	10
-=======
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	12
-stage/sql/closing tables	18
-stage/sql/init	12
-stage/sql/Opening tables	18
+stage/sql/closing tables	35
+stage/sql/init	9
+stage/sql/Opening tables	19
 stage/sql/starting	18
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1521,229 +915,96 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-<<<<<<< HEAD
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
-=======
 select uuid_short() <> 1;
 uuid_short() <> 1
->>>>>>> merge-perfschema-5.7
 1
 select uuid_short() <> 1;
 uuid_short() <> 1
 1
 start transaction;
 insert into test.t1 values ("marker");
-<<<<<<< HEAD
-connection default;
-=======
 commit;
 select test.f(10,20);
 test.f(10,20)
 30
-"================== con4 marker =================="
->>>>>>> merge-perfschema-5.7
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/file/sql/query_log	4
-=======
 user1	wait/io/file/sql/query_log	7
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	4
-=======
 user1	localhost	wait/io/file/sql/query_log	7
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	16
-=======
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
-wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
-execute dump_waits_history;
-event_name	count(event_name)
 wait/io/file/sql/query_log	28
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	5
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	6
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	20
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	24
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -1816,194 +1077,76 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user2	wait/io/file/sql/query_log	4
-=======
 user2	wait/io/file/sql/query_log	7
-user2	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user2	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	4
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	7
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	17
-=======
 wait/io/file/sql/query_log	29
-wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	6
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	21
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	25
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2079,180 +1222,73 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user3	wait/io/file/sql/query_log	4
-=======
 user3	wait/io/file/sql/query_log	7
-user3	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user3	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	4
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	7
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	18
-=======
 wait/io/file/sql/query_log	30
-wait/synch/mutex/sql/LOCK_connection_count	2
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	6
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	22
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	26
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2330,166 +1366,70 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-<<<<<<< HEAD
-user4	wait/io/file/sql/query_log	4
-=======
 user4	wait/io/file/sql/query_log	7
-user4	wait/synch/mutex/sql/LOCK_connection_count	0
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
 user4	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user4	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	4
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	7
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	19
-=======
 wait/io/file/sql/query_log	31
-wait/synch/mutex/sql/LOCK_connection_count	3
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	5
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	6
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	23
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	27
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2570,151 +1510,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -2796,151 +1651,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/file/sql/query_log	5
-=======
 user1	localhost	wait/io/file/sql/query_log	8
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user2	localhost	wait/io/file/sql/query_log	5
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user3	localhost	wait/io/file/sql/query_log	5
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-user4	localhost	wait/io/file/sql/query_log	5
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	2
 user2	localhost	wait/io/file/sql/query_log	8
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	8
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	2
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	8
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	1
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	2
-user4	localhost	wait/synch/rwlock/sql/LOCK_grant	2
->>>>>>> merge-perfschema-5.7
+user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3022,33 +1792,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -3056,111 +1805,52 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3242,33 +1932,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -3276,111 +1945,52 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3462,33 +2072,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -3496,111 +2085,52 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-wait/io/file/sql/query_log	20
-=======
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3682,33 +2212,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -3717,105 +2226,51 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -3897,33 +2352,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -3932,105 +2366,51 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	6
-user1	localhost	stage/sql/Init	6
-user1	localhost	stage/sql/Init for update	1
-user1	localhost	stage/sql/Opening tables	4
-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	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	4
-user4	localhost	stage/sql/Init	6
-user4	localhost	stage/sql/Init for update	1
-user4	localhost	stage/sql/Opening tables	3
-=======
 user1	localhost	stage/sql/checking permissions	4
-user1	localhost	stage/sql/closing tables	6
-user1	localhost	stage/sql/init	4
-user1	localhost	stage/sql/Opening tables	6
+user1	localhost	stage/sql/closing tables	13
+user1	localhost	stage/sql/init	3
+user1	localhost	stage/sql/Opening tables	7
 user1	localhost	stage/sql/starting	7
 user2	localhost	stage/sql/checking permissions	4
-user2	localhost	stage/sql/closing tables	6
-user2	localhost	stage/sql/init	4
+user2	localhost	stage/sql/closing tables	11
+user2	localhost	stage/sql/init	3
 user2	localhost	stage/sql/Opening tables	6
 user2	localhost	stage/sql/starting	7
 user3	localhost	stage/sql/checking permissions	4
-user3	localhost	stage/sql/closing tables	6
-user3	localhost	stage/sql/init	4
+user3	localhost	stage/sql/closing tables	11
+user3	localhost	stage/sql/init	3
 user3	localhost	stage/sql/Opening tables	6
 user3	localhost	stage/sql/starting	7
 user4	localhost	stage/sql/checking permissions	4
-user4	localhost	stage/sql/closing tables	6
-user4	localhost	stage/sql/init	4
+user4	localhost	stage/sql/closing tables	11
+user4	localhost	stage/sql/init	3
 user4	localhost	stage/sql/Opening tables	6
 user4	localhost	stage/sql/starting	7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4112,33 +2492,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -4147,50 +2506,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -4205,7 +2531,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -4214,33 +2539,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4322,33 +2632,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -4357,50 +2646,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -4415,7 +2671,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -4424,33 +2679,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4532,33 +2772,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -4567,50 +2786,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -4625,7 +2811,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -4634,33 +2819,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-execute dump_stages_history;
-event_name	count(event_name)
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4742,33 +2912,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -4777,50 +2926,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -4835,7 +2951,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -4844,27 +2959,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -4946,33 +3052,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -4981,50 +3066,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5039,7 +3091,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -5048,27 +3099,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5150,33 +3192,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -5185,50 +3206,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5243,7 +3231,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -5252,27 +3239,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5354,33 +3332,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -5389,50 +3346,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5447,7 +3371,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -5456,27 +3379,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5558,33 +3472,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -5593,50 +3486,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5651,7 +3511,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -5660,27 +3519,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5762,33 +3612,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
-user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
-=======
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -5797,50 +3626,17 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
-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/checking permissions	0
+user1	localhost	stage/sql/closing tables	0
+user1	localhost	stage/sql/init	0
 user1	localhost	stage/sql/Opening tables	0
-<<<<<<< HEAD
-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/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/Init for update	0
-=======
 user1	localhost	stage/sql/starting	0
 user2	localhost	stage/sql/checking permissions	0
 user2	localhost	stage/sql/closing tables	0
@@ -5855,7 +3651,6 @@ user3	localhost	stage/sql/starting	0
 user4	localhost	stage/sql/checking permissions	0
 user4	localhost	stage/sql/closing tables	0
 user4	localhost	stage/sql/init	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 user4	localhost	stage/sql/Opening tables	0
 user4	localhost	stage/sql/starting	0
 execute dump_stages_user;
@@ -5864,27 +3659,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -5966,20 +3752,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -5988,27 +3766,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -6037,27 +3799,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6139,20 +3892,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -6161,27 +3906,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -6210,27 +3939,18 @@ 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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
@@ -6312,20 +4032,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -6334,27 +4046,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-<<<<<<< HEAD
-wait/synch/mutex/sql/LOCK_user_locks	0
-wait/synch/rwlock/sql/LOCK_grant	0
-execute dump_waits_history;
-event_name	count(event_name)
-wait/io/file/sql/query_log	20
-=======
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/rwlock/sql/LOCK_grant	4
-=======
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
->>>>>>> merge-perfschema-5.7
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -6383,25 +4079,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/Init for update	0
+stage/sql/checking permissions	0
+stage/sql/closing tables	0
+stage/sql/init	0
 stage/sql/Opening tables	0
 stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
-<<<<<<< HEAD
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	18
-stage/sql/Init	24
-stage/sql/Init for update	4
-stage/sql/Opening tables	13
-=======
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6484,20 +4172,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -6506,15 +4186,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -6551,9 +4227,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6636,20 +4312,12 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	0
-user1	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user1	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user2	localhost	wait/io/file/sql/query_log	0
-user2	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user2	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user3	localhost	wait/io/file/sql/query_log	0
-user3	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user3	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 user4	localhost	wait/io/file/sql/query_log	0
-user4	localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-user4	localhost	wait/synch/mutex/sql/LOCK_uuid_generator	0
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -6658,15 +4326,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 user1	localhost	stage/sql/checking permissions	0
@@ -6703,9 +4367,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6794,15 +4458,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6819,9 +4479,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6882,15 +4542,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6907,9 +4563,9 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
@@ -6970,15 +4626,11 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-wait/synch/mutex/sql/LOCK_connection_count	0
-wait/synch/mutex/sql/LOCK_uuid_generator	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
 wait/io/file/sql/query_log	32
-wait/synch/mutex/sql/LOCK_connection_count	4
-wait/synch/mutex/sql/LOCK_uuid_generator	8
-wait/synch/rwlock/sql/LOCK_grant	8
+wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
 execute dump_stages_user;
@@ -6995,11 +4647,10 @@ stage/sql/starting	0
 execute dump_stages_history;
 event_name	count(event_name)
 stage/sql/checking permissions	16
-stage/sql/closing tables	24
-stage/sql/init	16
-stage/sql/Opening tables	24
+stage/sql/closing tables	46
+stage/sql/init	12
+stage/sql/Opening tables	25
 stage/sql/starting	28
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result
index 7522cdcf79c..df98b9bd1bb 100644
--- a/mysql-test/suite/perfschema/r/global_read_lock.result
+++ b/mysql-test/suite/perfschema/r/global_read_lock.result
@@ -1,19 +1,7 @@
 use performance_schema;
 update performance_schema.setup_instruments set enabled='YES';
-<<<<<<< HEAD
 create user pfsuser@localhost;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 flush privileges;
 connect  con1, localhost, pfsuser, , test;
 lock tables performance_schema.setup_instruments read;
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
index 875d084cbde..86cab03c4c6 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
index 968437450ad..33948013822 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
index a5655e360ec..f36e4604a7c 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
index d1ef24a5863..ff2a93efec4 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
index 3d69148a01f..2751dbd7edb 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
@@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
 select @@global.max_connect_errors into @saved_max_connect_errors;
 set global max_connect_errors = 3;
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv4.example.com';
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create user 'quota'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
index 1ed0114bc6a..3d41f013ba9 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
@@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_connections_per_hour 3;
-<<<<<<< HEAD
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
@@ -205,12 +200,8 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_connections_per_hour 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_user_connections 3;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 connect  con3a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
 select "Con7 is alive";
@@ -385,8 +376,6 @@ disconnect con3b;
 disconnect con3c;
 grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
   with max_user_connections 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 set global max_user_connections = 3;
 connect  con4a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
index e2ae8dcd721..bc7721aef30 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 create user 'root'@'santa.claus.ipv4.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
index 10448746142..236bc12d9bf 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'192.0.2.4';
 grant select on test.* to 'root'@'192.0.2.4';
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'192.0.2.4';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
index a27070de62d..267f346836d 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
@@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv4.example.com'
   identified by 'good_password';
 grant select on test.* to 'user_ssl'@'santa.claus.ipv4.example.com'
   REQUIRE SSL;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant select on test.* to 'user_ssl_x509'@'santa.claus.ipv4.example.com'
   REQUIRE SUBJECT '/C=??/ST=??/L=??/
     O=No such thing/
     CN=Santa Claus/emailAddress=santa.claus@example.com';
-<<<<<<< HEAD
 connect  con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
index c826f7f88fe..4325cfec6dc 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
index 38bb4bf5ced..57e14dfe913 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
index 4863a7e0526..f68d90978e7 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
index 8118b943386..50297797f6a 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
index 5ae11717392..757285b1033 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
@@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
 select @@global.max_connect_errors into @saved_max_connect_errors;
 set global max_connect_errors = 3;
-<<<<<<< HEAD
 create user 'root'@'santa.claus.ipv6.example.com';
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
index beee571b903..f2e25ab6ca1 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
@@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_connections_per_hour 3;
-<<<<<<< HEAD
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
@@ -205,12 +200,8 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_connections_per_hour 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_user_connections 3;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 connect  con3a,"::1",quota,,test,$MASTER_MYPORT,;
 select "Con7 is alive";
@@ -385,8 +376,6 @@ disconnect con3b;
 disconnect con3c;
 grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
   with max_user_connections 0;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 flush user_resources;
 set global max_user_connections = 3;
 connect  con4a,"::1",quota,,test,$MASTER_MYPORT,;
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
index f1ff03a48ab..357dfd3db3e 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 create user 'root'@'santa.claus.ipv6.example.com';
 grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
index ca340f2c4cb..f899cb935e9 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
 User	Host
 select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
 User	Host
-<<<<<<< HEAD
 create user 'root'@'2001:db8::6:6';
 grant select on test.* to 'root'@'2001:db8::6:6';
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-grant select on test.* to 'root'@'2001:db8::6:6';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
index 3283fa43193..9ec33df2fee 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
@@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv6.example.com'
   identified by 'good_password';
 grant select on test.* to 'user_ssl'@'santa.claus.ipv6.example.com'
   REQUIRE SSL;
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
 grant select on test.* to 'user_ssl_x509'@'santa.claus.ipv6.example.com'
   REQUIRE SUBJECT '/C=??/ST=??/L=??/
     O=No such thing/
     CN=Santa Claus/emailAddress=santa.claus@example.com';
-<<<<<<< HEAD
 connect  con1,"::1",root,,test,$MASTER_MYPORT,;
-=======
-Warnings:
-Warning	1287	Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
->>>>>>> merge-perfschema-5.7
 select "Con1 is alive";
 Con1 is alive
 Con1 is alive
diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result
index e61fd5001d5..3f4a8cf6336 100644
--- a/mysql-test/suite/perfschema/r/information_schema.result
+++ b/mysql-test/suite/perfschema/r/information_schema.result
@@ -43,21 +43,15 @@ performance_schema	events_waits_summary_global_by_event_name	def
 performance_schema	file_instances	def
 performance_schema	file_summary_by_event_name	def
 performance_schema	file_summary_by_instance	def
-<<<<<<< HEAD
-performance_schema	hosts	def
-performance_schema	host_cache	def
-=======
 performance_schema	global_status	def
-performance_schema	global_variables	def
-performance_schema	host_cache	def
 performance_schema	hosts	def
+performance_schema	host_cache	def
 performance_schema	memory_summary_by_account_by_event_name	def
 performance_schema	memory_summary_by_host_by_event_name	def
 performance_schema	memory_summary_by_thread_by_event_name	def
 performance_schema	memory_summary_by_user_by_event_name	def
 performance_schema	memory_summary_global_by_event_name	def
 performance_schema	metadata_locks	def
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 performance_schema	mutex_instances	def
 performance_schema	objects_summary_global_by_type	def
 performance_schema	performance_timers	def
@@ -65,16 +59,11 @@ performance_schema	prepared_statements_instances	def
 performance_schema	replication_applier_configuration	def
 performance_schema	replication_applier_status	def
 performance_schema	replication_applier_status_by_coordinator	def
-performance_schema	replication_applier_status_by_worker	def
 performance_schema	replication_connection_configuration	def
-performance_schema	replication_connection_status	def
-performance_schema	replication_group_member_stats	def
-performance_schema	replication_group_members	def
 performance_schema	rwlock_instances	def
 performance_schema	session_account_connect_attrs	def
 performance_schema	session_connect_attrs	def
 performance_schema	session_status	def
-performance_schema	session_variables	def
 performance_schema	setup_actors	def
 performance_schema	setup_consumers	def
 performance_schema	setup_instruments	def
@@ -92,9 +81,8 @@ performance_schema	table_io_waits_summary_by_index_usage	def
 performance_schema	table_io_waits_summary_by_table	def
 performance_schema	table_lock_waits_summary_by_table	def
 performance_schema	threads	def
-performance_schema	user_variables_by_thread	def
 performance_schema	users	def
-performance_schema	variables_by_thread	def
+performance_schema	user_variables_by_thread	def
 select lower(TABLE_NAME), TABLE_TYPE, ENGINE
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -140,21 +128,15 @@ events_waits_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 file_instances	BASE TABLE	PERFORMANCE_SCHEMA
 file_summary_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 file_summary_by_instance	BASE TABLE	PERFORMANCE_SCHEMA
-<<<<<<< HEAD
-hosts	BASE TABLE	PERFORMANCE_SCHEMA
-host_cache	BASE TABLE	PERFORMANCE_SCHEMA
-=======
 global_status	BASE TABLE	PERFORMANCE_SCHEMA
-global_variables	BASE TABLE	PERFORMANCE_SCHEMA
-host_cache	BASE TABLE	PERFORMANCE_SCHEMA
 hosts	BASE TABLE	PERFORMANCE_SCHEMA
+host_cache	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_account_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_host_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_thread_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_by_user_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 memory_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 metadata_locks	BASE TABLE	PERFORMANCE_SCHEMA
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	BASE TABLE	PERFORMANCE_SCHEMA
 objects_summary_global_by_type	BASE TABLE	PERFORMANCE_SCHEMA
 performance_timers	BASE TABLE	PERFORMANCE_SCHEMA
@@ -162,16 +144,11 @@ prepared_statements_instances	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_configuration	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_status	BASE TABLE	PERFORMANCE_SCHEMA
 replication_applier_status_by_coordinator	BASE TABLE	PERFORMANCE_SCHEMA
-replication_applier_status_by_worker	BASE TABLE	PERFORMANCE_SCHEMA
 replication_connection_configuration	BASE TABLE	PERFORMANCE_SCHEMA
-replication_connection_status	BASE TABLE	PERFORMANCE_SCHEMA
-replication_group_member_stats	BASE TABLE	PERFORMANCE_SCHEMA
-replication_group_members	BASE TABLE	PERFORMANCE_SCHEMA
 rwlock_instances	BASE TABLE	PERFORMANCE_SCHEMA
 session_account_connect_attrs	BASE TABLE	PERFORMANCE_SCHEMA
 session_connect_attrs	BASE TABLE	PERFORMANCE_SCHEMA
 session_status	BASE TABLE	PERFORMANCE_SCHEMA
-session_variables	BASE TABLE	PERFORMANCE_SCHEMA
 setup_actors	BASE TABLE	PERFORMANCE_SCHEMA
 setup_consumers	BASE TABLE	PERFORMANCE_SCHEMA
 setup_instruments	BASE TABLE	PERFORMANCE_SCHEMA
@@ -189,9 +166,8 @@ table_io_waits_summary_by_index_usage	BASE TABLE	PERFORMANCE_SCHEMA
 table_io_waits_summary_by_table	BASE TABLE	PERFORMANCE_SCHEMA
 table_lock_waits_summary_by_table	BASE TABLE	PERFORMANCE_SCHEMA
 threads	BASE TABLE	PERFORMANCE_SCHEMA
-user_variables_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
 users	BASE TABLE	PERFORMANCE_SCHEMA
-variables_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
+user_variables_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
 select lower(TABLE_NAME), VERSION, ROW_FORMAT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -237,21 +213,15 @@ events_waits_summary_global_by_event_name	10	Dynamic
 file_instances	10	Dynamic
 file_summary_by_event_name	10	Dynamic
 file_summary_by_instance	10	Dynamic
-<<<<<<< HEAD
-hosts	10	Fixed
-host_cache	10	Dynamic
-=======
 global_status	10	Dynamic
-global_variables	10	Dynamic
-host_cache	10	Dynamic
 hosts	10	Fixed
+host_cache	10	Dynamic
 memory_summary_by_account_by_event_name	10	Dynamic
 memory_summary_by_host_by_event_name	10	Dynamic
 memory_summary_by_thread_by_event_name	10	Dynamic
 memory_summary_by_user_by_event_name	10	Dynamic
 memory_summary_global_by_event_name	10	Dynamic
 metadata_locks	10	Dynamic
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	10	Dynamic
 objects_summary_global_by_type	10	Dynamic
 performance_timers	10	Fixed
@@ -259,16 +229,11 @@ prepared_statements_instances	10	Dynamic
 replication_applier_configuration	10	Fixed
 replication_applier_status	10	Fixed
 replication_applier_status_by_coordinator	10	Dynamic
-replication_applier_status_by_worker	10	Dynamic
 replication_connection_configuration	10	Dynamic
-replication_connection_status	10	Dynamic
-replication_group_member_stats	10	Dynamic
-replication_group_members	10	Fixed
 rwlock_instances	10	Dynamic
 session_account_connect_attrs	10	Dynamic
 session_connect_attrs	10	Dynamic
 session_status	10	Dynamic
-session_variables	10	Dynamic
 setup_actors	10	Fixed
 setup_consumers	10	Dynamic
 setup_instruments	10	Dynamic
@@ -286,13 +251,13 @@ table_io_waits_summary_by_index_usage	10	Dynamic
 table_io_waits_summary_by_table	10	Dynamic
 table_lock_waits_summary_by_table	10	Dynamic
 threads	10	Dynamic
-user_variables_by_thread	10	Dynamic
 users	10	Fixed
-variables_by_thread	10	Dynamic
+user_variables_by_thread	10	Dynamic
 select lower(TABLE_NAME), AVG_ROW_LENGTH
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema' and
-lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status';
+lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status'
+  order by table_name;
 lower(TABLE_NAME)	AVG_ROW_LENGTH
 accounts	0
 cond_instances	0
@@ -334,8 +299,8 @@ events_waits_summary_global_by_event_name	0
 file_instances	0
 file_summary_by_event_name	0
 file_summary_by_instance	0
-host_cache	0
 hosts	0
+host_cache	0
 memory_summary_by_account_by_event_name	0
 memory_summary_by_host_by_event_name	0
 memory_summary_by_thread_by_event_name	0
@@ -349,11 +314,7 @@ prepared_statements_instances	0
 replication_applier_configuration	0
 replication_applier_status	0
 replication_applier_status_by_coordinator	0
-replication_applier_status_by_worker	0
 replication_connection_configuration	0
-replication_connection_status	0
-replication_group_member_stats	0
-replication_group_members	0
 rwlock_instances	0
 session_account_connect_attrs	0
 session_connect_attrs	0
@@ -370,80 +331,20 @@ table_io_waits_summary_by_index_usage	0
 table_io_waits_summary_by_table	0
 table_lock_waits_summary_by_table	0
 threads	0
-user_variables_by_thread	0
 users	0
+user_variables_by_thread	0
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
 from information_schema.tables
-<<<<<<< HEAD
-where TABLE_SCHEMA='performance_schema'
-  order by table_name;
-lower(TABLE_NAME)	TABLE_ROWS	AVG_ROW_LENGTH
-accounts	1000	0
-cond_instances	1000	0
-events_stages_current	1000	0
-events_stages_history	1000	0
-events_stages_history_long	10000	0
-events_stages_summary_by_account_by_event_name	1000	0
-events_stages_summary_by_host_by_event_name	1000	0
-events_stages_summary_by_thread_by_event_name	1000	0
-events_stages_summary_by_user_by_event_name	1000	0
-events_stages_summary_global_by_event_name	1000	0
-events_statements_current	1000	0
-events_statements_history	1000	0
-events_statements_history_long	10000	0
-events_statements_summary_by_account_by_event_name	1000	0
-events_statements_summary_by_digest	1000	0
-events_statements_summary_by_host_by_event_name	1000	0
-events_statements_summary_by_thread_by_event_name	1000	0
-events_statements_summary_by_user_by_event_name	1000	0
-events_statements_summary_global_by_event_name	1000	0
-events_waits_current	1000	0
-events_waits_history	1000	0
-events_waits_history_long	10000	0
-events_waits_summary_by_account_by_event_name	1000	0
-events_waits_summary_by_host_by_event_name	1000	0
-events_waits_summary_by_instance	1000	0
-events_waits_summary_by_thread_by_event_name	1000	0
-events_waits_summary_by_user_by_event_name	1000	0
-events_waits_summary_global_by_event_name	1000	0
-file_instances	1000	0
-file_summary_by_event_name	1000	0
-file_summary_by_instance	1000	0
-hosts	1000	0
-host_cache	1000	0
-mutex_instances	1000	0
-objects_summary_global_by_type	1000	0
-performance_timers	5	0
-rwlock_instances	1000	0
-session_account_connect_attrs	1000	0
-session_connect_attrs	1000	0
-setup_actors	1	0
-setup_consumers	12	0
-setup_instruments	1000	0
-setup_objects	4	0
-setup_timers	4	0
-socket_instances	1000	0
-socket_summary_by_event_name	1000	0
-socket_summary_by_instance	1000	0
-table_io_waits_summary_by_index_usage	1000	0
-table_io_waits_summary_by_table	1000	0
-table_lock_waits_summary_by_table	1000	0
-threads	1000	0
-users	1000	0
-=======
 where TABLE_SCHEMA='performance_schema' and
-lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status';
+lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status'
+  order by table_name;
 lower(TABLE_NAME)	TABLE_ROWS	AVG_ROW_LENGTH
 global_status	table_rows	avg_row_len
-global_variables	table_rows	avg_row_len
 session_status	table_rows	avg_row_len
-session_variables	table_rows	avg_row_len
 status_by_account	table_rows	avg_row_len
 status_by_host	table_rows	avg_row_len
 status_by_thread	table_rows	avg_row_len
 status_by_user	table_rows	avg_row_len
-variables_by_thread	table_rows	avg_row_len
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -489,21 +390,15 @@ events_waits_summary_global_by_event_name	0	0
 file_instances	0	0
 file_summary_by_event_name	0	0
 file_summary_by_instance	0	0
-<<<<<<< HEAD
-hosts	0	0
-host_cache	0	0
-=======
 global_status	0	0
-global_variables	0	0
-host_cache	0	0
 hosts	0	0
+host_cache	0	0
 memory_summary_by_account_by_event_name	0	0
 memory_summary_by_host_by_event_name	0	0
 memory_summary_by_thread_by_event_name	0	0
 memory_summary_by_user_by_event_name	0	0
 memory_summary_global_by_event_name	0	0
 metadata_locks	0	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	0	0
 objects_summary_global_by_type	0	0
 performance_timers	0	0
@@ -511,16 +406,11 @@ prepared_statements_instances	0	0
 replication_applier_configuration	0	0
 replication_applier_status	0	0
 replication_applier_status_by_coordinator	0	0
-replication_applier_status_by_worker	0	0
 replication_connection_configuration	0	0
-replication_connection_status	0	0
-replication_group_member_stats	0	0
-replication_group_members	0	0
 rwlock_instances	0	0
 session_account_connect_attrs	0	0
 session_connect_attrs	0	0
 session_status	0	0
-session_variables	0	0
 setup_actors	0	0
 setup_consumers	0	0
 setup_instruments	0	0
@@ -538,9 +428,8 @@ table_io_waits_summary_by_index_usage	0	0
 table_io_waits_summary_by_table	0	0
 table_lock_waits_summary_by_table	0	0
 threads	0	0
-user_variables_by_thread	0	0
 users	0	0
-variables_by_thread	0	0
+user_variables_by_thread	0	0
 select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -586,21 +475,15 @@ events_waits_summary_global_by_event_name	0	0	NULL
 file_instances	0	0	NULL
 file_summary_by_event_name	0	0	NULL
 file_summary_by_instance	0	0	NULL
-<<<<<<< HEAD
-hosts	0	0	NULL
-host_cache	0	0	NULL
-=======
 global_status	0	0	NULL
-global_variables	0	0	NULL
-host_cache	0	0	NULL
 hosts	0	0	NULL
+host_cache	0	0	NULL
 memory_summary_by_account_by_event_name	0	0	NULL
 memory_summary_by_host_by_event_name	0	0	NULL
 memory_summary_by_thread_by_event_name	0	0	NULL
 memory_summary_by_user_by_event_name	0	0	NULL
 memory_summary_global_by_event_name	0	0	NULL
 metadata_locks	0	0	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	0	0	NULL
 objects_summary_global_by_type	0	0	NULL
 performance_timers	0	0	NULL
@@ -608,16 +491,11 @@ prepared_statements_instances	0	0	NULL
 replication_applier_configuration	0	0	NULL
 replication_applier_status	0	0	NULL
 replication_applier_status_by_coordinator	0	0	NULL
-replication_applier_status_by_worker	0	0	NULL
 replication_connection_configuration	0	0	NULL
-replication_connection_status	0	0	NULL
-replication_group_member_stats	0	0	NULL
-replication_group_members	0	0	NULL
 rwlock_instances	0	0	NULL
 session_account_connect_attrs	0	0	NULL
 session_connect_attrs	0	0	NULL
 session_status	0	0	NULL
-session_variables	0	0	NULL
 setup_actors	0	0	NULL
 setup_consumers	0	0	NULL
 setup_instruments	0	0	NULL
@@ -635,9 +513,8 @@ table_io_waits_summary_by_index_usage	0	0	NULL
 table_io_waits_summary_by_table	0	0	NULL
 table_lock_waits_summary_by_table	0	0	NULL
 threads	0	0	NULL
-user_variables_by_thread	0	0	NULL
 users	0	0	NULL
-variables_by_thread	0	0	NULL
+user_variables_by_thread	0	0	NULL
 select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -683,21 +560,15 @@ events_waits_summary_global_by_event_name	NULL	NULL	NULL
 file_instances	NULL	NULL	NULL
 file_summary_by_event_name	NULL	NULL	NULL
 file_summary_by_instance	NULL	NULL	NULL
-<<<<<<< HEAD
-hosts	NULL	NULL	NULL
-host_cache	NULL	NULL	NULL
-=======
 global_status	NULL	NULL	NULL
-global_variables	NULL	NULL	NULL
-host_cache	NULL	NULL	NULL
 hosts	NULL	NULL	NULL
+host_cache	NULL	NULL	NULL
 memory_summary_by_account_by_event_name	NULL	NULL	NULL
 memory_summary_by_host_by_event_name	NULL	NULL	NULL
 memory_summary_by_thread_by_event_name	NULL	NULL	NULL
 memory_summary_by_user_by_event_name	NULL	NULL	NULL
 memory_summary_global_by_event_name	NULL	NULL	NULL
 metadata_locks	NULL	NULL	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	NULL	NULL	NULL
 objects_summary_global_by_type	NULL	NULL	NULL
 performance_timers	NULL	NULL	NULL
@@ -705,16 +576,11 @@ prepared_statements_instances	NULL	NULL	NULL
 replication_applier_configuration	NULL	NULL	NULL
 replication_applier_status	NULL	NULL	NULL
 replication_applier_status_by_coordinator	NULL	NULL	NULL
-replication_applier_status_by_worker	NULL	NULL	NULL
 replication_connection_configuration	NULL	NULL	NULL
-replication_connection_status	NULL	NULL	NULL
-replication_group_member_stats	NULL	NULL	NULL
-replication_group_members	NULL	NULL	NULL
 rwlock_instances	NULL	NULL	NULL
 session_account_connect_attrs	NULL	NULL	NULL
 session_connect_attrs	NULL	NULL	NULL
 session_status	NULL	NULL	NULL
-session_variables	NULL	NULL	NULL
 setup_actors	NULL	NULL	NULL
 setup_consumers	NULL	NULL	NULL
 setup_instruments	NULL	NULL	NULL
@@ -732,9 +598,8 @@ table_io_waits_summary_by_index_usage	NULL	NULL	NULL
 table_io_waits_summary_by_table	NULL	NULL	NULL
 table_lock_waits_summary_by_table	NULL	NULL	NULL
 threads	NULL	NULL	NULL
-user_variables_by_thread	NULL	NULL	NULL
 users	NULL	NULL	NULL
-variables_by_thread	NULL	NULL	NULL
+user_variables_by_thread	NULL	NULL	NULL
 select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -780,21 +645,15 @@ events_waits_summary_global_by_event_name	utf8_general_ci	NULL
 file_instances	utf8_general_ci	NULL
 file_summary_by_event_name	utf8_general_ci	NULL
 file_summary_by_instance	utf8_general_ci	NULL
-<<<<<<< HEAD
-hosts	utf8_general_ci	NULL
-host_cache	utf8_general_ci	NULL
-=======
 global_status	utf8_general_ci	NULL
-global_variables	utf8_general_ci	NULL
-host_cache	utf8_general_ci	NULL
 hosts	utf8_general_ci	NULL
+host_cache	utf8_general_ci	NULL
 memory_summary_by_account_by_event_name	utf8_general_ci	NULL
 memory_summary_by_host_by_event_name	utf8_general_ci	NULL
 memory_summary_by_thread_by_event_name	utf8_general_ci	NULL
 memory_summary_by_user_by_event_name	utf8_general_ci	NULL
 memory_summary_global_by_event_name	utf8_general_ci	NULL
 metadata_locks	utf8_general_ci	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	utf8_general_ci	NULL
 objects_summary_global_by_type	utf8_general_ci	NULL
 performance_timers	utf8_general_ci	NULL
@@ -802,16 +661,11 @@ prepared_statements_instances	utf8_general_ci	NULL
 replication_applier_configuration	utf8_general_ci	NULL
 replication_applier_status	utf8_general_ci	NULL
 replication_applier_status_by_coordinator	utf8_general_ci	NULL
-replication_applier_status_by_worker	utf8_general_ci	NULL
 replication_connection_configuration	utf8_general_ci	NULL
-replication_connection_status	utf8_general_ci	NULL
-replication_group_member_stats	utf8_general_ci	NULL
-replication_group_members	utf8_general_ci	NULL
 rwlock_instances	utf8_general_ci	NULL
 session_account_connect_attrs	utf8_bin	NULL
 session_connect_attrs	utf8_bin	NULL
 session_status	utf8_general_ci	NULL
-session_variables	utf8_general_ci	NULL
 setup_actors	utf8_general_ci	NULL
 setup_consumers	utf8_general_ci	NULL
 setup_instruments	utf8_general_ci	NULL
@@ -829,12 +683,12 @@ table_io_waits_summary_by_index_usage	utf8_general_ci	NULL
 table_io_waits_summary_by_table	utf8_general_ci	NULL
 table_lock_waits_summary_by_table	utf8_general_ci	NULL
 threads	utf8_general_ci	NULL
-user_variables_by_thread	utf8_general_ci	NULL
 users	utf8_general_ci	NULL
-variables_by_thread	utf8_general_ci	NULL
+user_variables_by_thread	utf8_general_ci	NULL
 select lower(TABLE_NAME), CREATE_OPTIONS
 from information_schema.tables
-where TABLE_SCHEMA='performance_schema';
+where TABLE_SCHEMA='performance_schema'
+  order by table_name;
 lower(TABLE_NAME)	CREATE_OPTIONS
 accounts	
 cond_instances	
@@ -877,9 +731,8 @@ file_instances
 file_summary_by_event_name	
 file_summary_by_instance	
 global_status	
-global_variables	
-host_cache	
 hosts	
+host_cache	
 memory_summary_by_account_by_event_name	
 memory_summary_by_host_by_event_name	
 memory_summary_by_thread_by_event_name	
@@ -893,16 +746,11 @@ prepared_statements_instances
 replication_applier_configuration	
 replication_applier_status	
 replication_applier_status_by_coordinator	
-replication_applier_status_by_worker	
 replication_connection_configuration	
-replication_connection_status	
-replication_group_member_stats	
-replication_group_members	
 rwlock_instances	
 session_account_connect_attrs	
 session_connect_attrs	
 session_status	
-session_variables	
 setup_actors	
 setup_consumers	
 setup_instruments	
@@ -920,9 +768,8 @@ table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table	
 table_lock_waits_summary_by_table	
 threads	
-user_variables_by_thread	
 users	
-variables_by_thread	
+user_variables_by_thread	
 select lower(TABLE_NAME), TABLE_COMMENT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -968,21 +815,15 @@ events_waits_summary_global_by_event_name
 file_instances	
 file_summary_by_event_name	
 file_summary_by_instance	
-<<<<<<< HEAD
-hosts	
-host_cache	
-=======
 global_status	
-global_variables	
-host_cache	
 hosts	
+host_cache	
 memory_summary_by_account_by_event_name	
 memory_summary_by_host_by_event_name	
 memory_summary_by_thread_by_event_name	
 memory_summary_by_user_by_event_name	
 memory_summary_global_by_event_name	
 metadata_locks	
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 mutex_instances	
 objects_summary_global_by_type	
 performance_timers	
@@ -990,16 +831,11 @@ prepared_statements_instances
 replication_applier_configuration	
 replication_applier_status	
 replication_applier_status_by_coordinator	
-replication_applier_status_by_worker	
 replication_connection_configuration	
-replication_connection_status	
-replication_group_member_stats	
-replication_group_members	
 rwlock_instances	
 session_account_connect_attrs	
 session_connect_attrs	
 session_status	
-session_variables	
 setup_actors	
 setup_consumers	
 setup_instruments	
@@ -1017,6 +853,5 @@ table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table	
 table_lock_waits_summary_by_table	
 threads	
-user_variables_by_thread	
 users	
-variables_by_thread	
+user_variables_by_thread	
diff --git a/mysql-test/suite/perfschema/r/innodb_table_io.result b/mysql-test/suite/perfschema/r/innodb_table_io.result
index 973d33e1460..286f0516e62 100644
--- a/mysql-test/suite/perfschema/r/innodb_table_io.result
+++ b/mysql-test/suite/perfschema/r/innodb_table_io.result
@@ -71,98 +71,51 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -171,17 +124,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/io_cache.result b/mysql-test/suite/perfschema/r/io_cache.result
index 48988cb3a05..4b742610a39 100644
--- a/mysql-test/suite/perfschema/r/io_cache.result
+++ b/mysql-test/suite/perfschema/r/io_cache.result
@@ -1,6 +1,7 @@
 
 ## Connection default
 
+connection default;
 USE test;
 DROP TABLE IF EXISTS t1;
 SELECT @@global.binlog_cache_size;
@@ -15,6 +16,7 @@ wait/io/file/sql/io_cache	YES	YES
 
 ## Connection con1
 
+connect con1, localhost, root,,;
 USE test;
 CREATE TABLE t1 (s1 INT, s2 VARCHAR(4096));
 SET SESSION AUTOCOMMIT = 0;
@@ -79,13 +81,16 @@ COMMIT;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 8
+disconnect con1;
 
 ## Connection default
 
+connection default;
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)
 8
 SELECT COUNT(*) FROM performance_schema.file_summary_by_event_name WHERE event_name LIKE "%io_cache%";
 COUNT(*)
 1
+connection default;
 DROP TABLE t1;
diff --git a/mysql-test/suite/perfschema/r/max_program_zero.result b/mysql-test/suite/perfschema/r/max_program_zero.result
index 54a203e8289..b75b24ffdb4 100644
--- a/mysql-test/suite/perfschema/r/max_program_zero.result
+++ b/mysql-test/suite/perfschema/r/max_program_zero.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	1
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -172,7 +166,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-);
+) engine=innodb;
 ############################
 # Creating Stored Programs #
 ############################
diff --git a/mysql-test/suite/perfschema/r/mdl_func.result b/mysql-test/suite/perfschema/r/mdl_func.result
index c58dcda625f..4887b15efa5 100644
--- a/mysql-test/suite/perfschema/r/mdl_func.result
+++ b/mysql-test/suite/perfschema/r/mdl_func.result
@@ -5,21 +5,16 @@ WHERE name in ('wait/io/table/sql/handler',
 'wait/lock/metadata/sql/mdl');
 set @orig_sql_mode= @@sql_mode;
 set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 grant ALL on *.* to user1@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 grant ALL on *.* to user2@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 insert into performance_schema.setup_objects (object_type, object_schema, object_name, enabled, timed)
 values ('TABLE', 'mtr', '%', 'NO', 'NO');
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 # Switch to (con2, localhost, user2, , )
+connect  con2, localhost, user2, , ;
+connection default;
 drop function if exists thread_id_name;
 create function thread_id_name(THREAD_ID int)
 returns varchar(16)
@@ -89,10 +84,12 @@ INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
+connection con1;
 BEGIN;
 SELECT * from t1 where id=1;
 id	b
 1	initial value
+connection default;
 "---- Marker 1 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -120,18 +117,14 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	READ
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
 execute dump_waits_history_long;
+connection con1;
 COMMIT;
+connection default;
 "---- Marker 2 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -152,19 +145,15 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	READ
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
 execute dump_waits_history_long;
+connection con1;
 BEGIN;
 UPDATE t1 set b="new value" where id=2;
+connection default;
 "---- Marker 3 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -192,19 +181,15 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
 execute dump_waits_history_long;
+connection con2;
 BEGIN;
 DROP TABLE t1;;
+connection default;
 "---- Marker 4 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -214,13 +199,6 @@ LOCK_TYPE	SHARED
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	GLOBAL
-OBJECT_SCHEMA	NULL
-OBJECT_NAME	NULL
-LOCK_TYPE	INTENTION_EXCLUSIVE
-LOCK_DURATION	STATEMENT
-LOCK_STATUS	GRANTED
-OWNER_THREAD_ID	USER2
 OBJECT_TYPE	SCHEMA
 OBJECT_SCHEMA	test
 OBJECT_NAME	NULL
@@ -253,13 +231,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
@@ -273,7 +245,10 @@ OBJECT_NAME	t1
 INDEX_NAME	NULL
 OPERATION	metadata lock
 execute dump_waits_history_long;
+connection con1;
 COMMIT;
+connection con2;
+connection default;
 "---- Marker 5 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -311,11 +286,14 @@ OBJECT_SCHEMA	test
 OBJECT_NAME	t1
 INDEX_NAME	NULL
 OPERATION	metadata lock
+connection default;
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
 create table t1 (a int);
+connection con1;
 LOCK TABLE t1 READ;
+connection default;
 "---- Marker 6 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -335,7 +313,7 @@ OWNER_THREAD_ID	OTHER
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-LOCK_TYPE	SHARED_READ_ONLY
+LOCK_TYPE	SHARED_READ
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER1
@@ -343,12 +321,14 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	READ NO INSERT
 EXTERNAL_LOCK	READ EXTERNAL
 OWNER_THREAD_ID	USER1
 execute dump_waits_current;
 execute dump_waits_history_long;
+connection con2;
 LOCK TABLE t1 write;;
+connection default;
 "---- Marker 7 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -358,13 +338,6 @@ LOCK_TYPE	SHARED
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	GLOBAL
-OBJECT_SCHEMA	NULL
-OBJECT_NAME	NULL
-LOCK_TYPE	INTENTION_EXCLUSIVE
-LOCK_DURATION	STATEMENT
-LOCK_STATUS	GRANTED
-OWNER_THREAD_ID	USER2
 OBJECT_TYPE	SCHEMA
 OBJECT_SCHEMA	test
 OBJECT_NAME	NULL
@@ -389,7 +362,7 @@ OWNER_THREAD_ID	USER2
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-LOCK_TYPE	SHARED_READ_ONLY
+LOCK_TYPE	SHARED_READ
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER1
@@ -397,7 +370,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	READ NO INSERT
 EXTERNAL_LOCK	READ EXTERNAL
 OWNER_THREAD_ID	USER1
 execute dump_waits_current;
@@ -411,9 +384,26 @@ OBJECT_NAME	t1
 INDEX_NAME	NULL
 OPERATION	metadata lock
 execute dump_waits_history_long;
+connection con1;
 UNLOCK TABLES;
+connection con2;
+connection default;
 "---- Marker 8 ----"
 execute dump_metadata_locks;
+OBJECT_TYPE	BACKUP
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+LOCK_TYPE	BACKUP_DDL
+LOCK_DURATION	STATEMENT
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	BACKUP
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+LOCK_TYPE	BACKUP_DML
+LOCK_DURATION	STATEMENT
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
 OBJECT_TYPE	FUNCTION
 OBJECT_SCHEMA	test
 OBJECT_NAME	thread_id_name
@@ -421,13 +411,6 @@ LOCK_TYPE	SHARED
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	GLOBAL
-OBJECT_SCHEMA	NULL
-OBJECT_NAME	NULL
-LOCK_TYPE	INTENTION_EXCLUSIVE
-LOCK_DURATION	STATEMENT
-LOCK_STATUS	GRANTED
-OWNER_THREAD_ID	USER2
 OBJECT_TYPE	SCHEMA
 OBJECT_SCHEMA	test
 OBJECT_NAME	NULL
@@ -453,13 +436,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE
 EXTERNAL_LOCK	WRITE EXTERNAL
 OWNER_THREAD_ID	USER2
 execute dump_waits_current;
@@ -473,9 +450,25 @@ OBJECT_SCHEMA	test
 OBJECT_NAME	t1
 INDEX_NAME	NULL
 OPERATION	metadata lock
+connection con1;
 LOCK TABLES t1 read;;
+connection default;
 "---- Marker 9 ----"
 execute dump_metadata_locks;
+OBJECT_TYPE	BACKUP
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+LOCK_TYPE	BACKUP_DDL
+LOCK_DURATION	STATEMENT
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	BACKUP
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+LOCK_TYPE	BACKUP_DML
+LOCK_DURATION	STATEMENT
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
 OBJECT_TYPE	FUNCTION
 OBJECT_SCHEMA	test
 OBJECT_NAME	thread_id_name
@@ -483,13 +476,6 @@ LOCK_TYPE	SHARED
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	GLOBAL
-OBJECT_SCHEMA	NULL
-OBJECT_NAME	NULL
-LOCK_TYPE	INTENTION_EXCLUSIVE
-LOCK_DURATION	STATEMENT
-LOCK_STATUS	GRANTED
-OWNER_THREAD_ID	USER2
 OBJECT_TYPE	SCHEMA
 OBJECT_SCHEMA	test
 OBJECT_NAME	NULL
@@ -514,7 +500,7 @@ OWNER_THREAD_ID	USER2
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-LOCK_TYPE	SHARED_READ_ONLY
+LOCK_TYPE	SHARED_READ
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	PENDING
 OWNER_THREAD_ID	USER1
@@ -522,13 +508,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE
 EXTERNAL_LOCK	WRITE EXTERNAL
 OWNER_THREAD_ID	USER2
 execute dump_waits_current;
@@ -551,7 +531,10 @@ OBJECT_SCHEMA	test
 OBJECT_NAME	t1
 INDEX_NAME	NULL
 OPERATION	metadata lock
+connection con2;
 UNLOCK TABLES;
+connection con1;
+connection default;
 "---- Marker 10 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -571,7 +554,7 @@ OWNER_THREAD_ID	OTHER
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-LOCK_TYPE	SHARED_READ_ONLY
+LOCK_TYPE	SHARED_READ
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER1
@@ -579,13 +562,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	READ NO INSERT
 EXTERNAL_LOCK	READ EXTERNAL
 OWNER_THREAD_ID	USER1
 execute dump_waits_current;
@@ -608,7 +585,9 @@ OBJECT_SCHEMA	test
 OBJECT_NAME	t1
 INDEX_NAME	NULL
 OPERATION	metadata lock
+connection con1;
 UNLOCK TABLES;
+connection default;
 "---- Marker 11 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -629,13 +608,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	READ NO INSERT
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
@@ -661,8 +634,10 @@ OPERATION	metadata lock
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
+connection con1;
 BEGIN;
 UPDATE LOW_PRIORITY t1 SET a=8;
+connection default;
 "---- Marker 12 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -682,7 +657,7 @@ OWNER_THREAD_ID	OTHER
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-LOCK_TYPE	SHARED_WRITE_LOW_PRIO
+LOCK_TYPE	SHARED_WRITE
 LOCK_DURATION	TRANSACTION
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER1
@@ -690,24 +665,22 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE LOW PRIORITY
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
 execute dump_waits_history_long;
+connection con1;
 COMMIT;
+connection default;
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
+connection con1;
 SELECT GET_LOCK('test', 0);
 GET_LOCK('test', 0)
 1
+connection default;
 "---- Marker 13 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -727,7 +700,7 @@ OWNER_THREAD_ID	OTHER
 OBJECT_TYPE	USER LEVEL LOCK
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	test
-LOCK_TYPE	EXCLUSIVE
+LOCK_TYPE	SHARED_NO_WRITE
 LOCK_DURATION	EXPLICIT
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER1
@@ -735,18 +708,14 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE LOW PRIORITY
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
 execute dump_waits_history_long;
+connection con2;
 SELECT GET_LOCK('test', 120);;
+connection default;
 "---- Marker 14 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -766,14 +735,14 @@ OWNER_THREAD_ID	OTHER
 OBJECT_TYPE	USER LEVEL LOCK
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	test
-LOCK_TYPE	EXCLUSIVE
+LOCK_TYPE	SHARED_NO_WRITE
 LOCK_DURATION	EXPLICIT
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER1
 OBJECT_TYPE	USER LEVEL LOCK
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	test
-LOCK_TYPE	EXCLUSIVE
+LOCK_TYPE	SHARED_NO_WRITE
 LOCK_DURATION	EXPLICIT
 LOCK_STATUS	PENDING
 OWNER_THREAD_ID	USER2
@@ -781,13 +750,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE LOW PRIORITY
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
@@ -801,11 +764,14 @@ OBJECT_NAME	test
 INDEX_NAME	NULL
 OPERATION	metadata lock
 execute dump_waits_history_long;
+connection con1;
 SELECT RELEASE_LOCK('test');
 RELEASE_LOCK('test')
 1
+connection con2;
 GET_LOCK('test', 120)
 1
+connection default;
 "---- Marker 15 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -825,7 +791,7 @@ OWNER_THREAD_ID	OTHER
 OBJECT_TYPE	USER LEVEL LOCK
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	test
-LOCK_TYPE	EXCLUSIVE
+LOCK_TYPE	SHARED_NO_WRITE
 LOCK_DURATION	EXPLICIT
 LOCK_STATUS	GRANTED
 OWNER_THREAD_ID	USER2
@@ -833,13 +799,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE LOW PRIORITY
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
@@ -862,9 +822,11 @@ OBJECT_SCHEMA	NULL
 OBJECT_NAME	test
 INDEX_NAME	NULL
 OPERATION	metadata lock
+connection con2;
 SELECT RELEASE_LOCK('test');
 RELEASE_LOCK('test')
 1
+connection default;
 "---- Marker 16 ----"
 execute dump_metadata_locks;
 OBJECT_TYPE	FUNCTION
@@ -885,13 +847,7 @@ execute dump_table_handles;
 OBJECT_TYPE	TABLE
 OBJECT_SCHEMA	test
 OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
-EXTERNAL_LOCK	NULL
-OWNER_THREAD_ID	OTHER
-OBJECT_TYPE	TABLE
-OBJECT_SCHEMA	test
-OBJECT_NAME	t1
-INTERNAL_LOCK	NULL
+INTERNAL_LOCK	WRITE LOW PRIORITY
 EXTERNAL_LOCK	NULL
 OWNER_THREAD_ID	OTHER
 execute dump_waits_current;
@@ -914,6 +870,9 @@ OBJECT_SCHEMA	NULL
 OBJECT_NAME	test
 INDEX_NAME	NULL
 OPERATION	metadata lock
+disconnect con1;
+disconnect con2;
+connection default;
 drop table t1;
 UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
 revoke all privileges, grant option from user1@localhost;
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate.result b/mysql-test/suite/perfschema/r/memory_aggregate.result
index bb1718ed13c..69eb033e74b 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -42,14 +30,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -76,14 +64,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -93,7 +81,9 @@ root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -195,14 +185,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -229,14 +219,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -248,9 +238,8 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -261,6 +250,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -279,14 +269,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -312,14 +302,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -337,14 +327,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -362,26 +352,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -396,14 +386,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -415,7 +405,9 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -434,14 +426,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -489,14 +481,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -540,14 +532,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -589,26 +581,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -623,14 +615,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -644,9 +636,8 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -657,6 +648,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -675,14 +667,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -699,14 +691,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -730,14 +722,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -756,14 +748,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -781,14 +773,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -805,14 +797,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -835,21 +827,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -869,7 +861,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -905,14 +897,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -929,14 +921,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -960,14 +952,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -986,14 +978,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -1011,14 +1003,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1035,14 +1027,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1065,21 +1057,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -1099,7 +1091,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1115,7 +1107,9 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -1134,14 +1128,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1158,14 +1152,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1211,14 +1205,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1237,14 +1231,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1288,14 +1282,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1312,14 +1306,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1366,21 +1360,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -1400,7 +1394,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1418,9 +1412,8 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -1431,6 +1424,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -1449,14 +1443,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1473,14 +1467,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1497,14 +1491,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1526,14 +1520,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1552,14 +1546,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1578,14 +1572,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -1603,14 +1597,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1627,14 +1621,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1651,14 +1645,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1676,26 +1670,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1710,14 +1704,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1733,7 +1727,10 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1752,14 +1749,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1776,14 +1773,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1800,14 +1797,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1851,14 +1848,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1877,14 +1874,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1903,14 +1900,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1954,14 +1951,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1978,14 +1975,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2002,14 +1999,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -2051,26 +2048,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -2085,14 +2082,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2110,9 +2107,8 @@ user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -2122,6 +2118,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -2132,6 +2129,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -2150,14 +2148,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -2174,14 +2172,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2198,14 +2196,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2222,14 +2220,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2249,14 +2247,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2275,14 +2273,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2301,14 +2299,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2327,14 +2325,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -2352,14 +2350,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2376,14 +2374,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2400,14 +2398,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2424,14 +2422,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2449,26 +2447,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -2483,14 +2481,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2508,6 +2506,9 @@ user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -2529,14 +2530,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2553,14 +2554,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2577,14 +2578,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2604,14 +2605,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2630,14 +2631,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2656,14 +2657,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2682,14 +2683,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -2707,14 +2708,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2731,14 +2732,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2755,14 +2756,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2779,14 +2780,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2804,26 +2805,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -2838,14 +2839,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2863,6 +2864,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	6
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -2886,14 +2889,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2910,14 +2913,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2937,14 +2940,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2963,14 +2966,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2989,14 +2992,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3015,14 +3018,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3040,14 +3043,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3064,14 +3067,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3088,14 +3091,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3112,14 +3115,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3137,26 +3140,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -3171,14 +3174,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3196,6 +3199,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	6
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -3221,14 +3226,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -3248,14 +3253,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3274,14 +3279,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3300,14 +3305,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3326,14 +3331,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3351,14 +3356,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3375,14 +3380,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3399,14 +3404,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3423,14 +3428,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3448,26 +3453,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -3482,14 +3487,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3507,6 +3512,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	6
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -3537,14 +3544,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3563,14 +3570,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3589,14 +3596,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3615,14 +3622,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3640,14 +3647,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3664,14 +3671,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3688,14 +3695,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3712,14 +3719,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3737,26 +3744,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3771,14 +3778,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3796,6 +3803,7 @@ user4	0	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	6
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -3827,14 +3835,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3853,14 +3861,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3879,14 +3887,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3905,14 +3913,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3930,14 +3938,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3954,14 +3962,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3978,14 +3986,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -4002,14 +4010,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -4027,26 +4035,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -4061,14 +4069,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4220,14 +4228,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -4244,14 +4252,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -4268,14 +4276,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -4292,14 +4300,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -4317,26 +4325,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -4351,14 +4359,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4607,26 +4615,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -4641,14 +4649,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4897,26 +4905,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -4931,14 +4939,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5187,26 +5195,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5221,14 +5229,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5373,26 +5381,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5407,14 +5415,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5459,26 +5467,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5493,14 +5501,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5541,26 +5549,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5575,14 +5583,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5592,5 +5600,3 @@ root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result b/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
index 5639a62cbc5..2b8ee675650 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -42,14 +30,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -76,14 +64,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -93,7 +81,9 @@ root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -195,14 +185,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -229,14 +219,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -248,9 +238,8 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -261,32 +250,33 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -299,111 +289,111 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1032192
+SUM_NUMBER_OF_BYTES_ALLOC	24576
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1032192
-HIGH_NUMBER_OF_BYTES_USED	1032192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -415,33 +405,35 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -476,27 +468,27 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -528,26 +520,26 @@ USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -577,60 +569,60 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1032192
+SUM_NUMBER_OF_BYTES_ALLOC	24576
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1032192
-HIGH_NUMBER_OF_BYTES_USED	1032192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -644,9 +636,8 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -657,56 +648,57 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -717,115 +709,115 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	7
@@ -835,32 +827,32 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3088384
-SUM_NUMBER_OF_BYTES_FREE	1032192
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	49152
+SUM_NUMBER_OF_BYTES_FREE	24576
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2056192
-HIGH_NUMBER_OF_BYTES_USED	2056192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	7
 COUNT_FREE	0
@@ -869,7 +861,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -893,50 +885,50 @@ username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -947,115 +939,115 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	7
@@ -1065,32 +1057,32 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3088384
-SUM_NUMBER_OF_BYTES_FREE	1032192
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	49152
+SUM_NUMBER_OF_BYTES_FREE	24576
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2056192
-HIGH_NUMBER_OF_BYTES_USED	2056192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	7
 COUNT_FREE	0
@@ -1099,7 +1091,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1115,57 +1107,59 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1198,53 +1192,53 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1276,50 +1270,50 @@ USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1349,14 +1343,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	7
@@ -1366,32 +1360,32 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3088384
-SUM_NUMBER_OF_BYTES_FREE	1032192
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	49152
+SUM_NUMBER_OF_BYTES_FREE	24576
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2056192
-HIGH_NUMBER_OF_BYTES_USED	2056192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	7
 COUNT_FREE	0
@@ -1400,7 +1394,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1418,9 +1412,8 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -1431,80 +1424,81 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1513,211 +1507,211 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	408
+SUM_NUMBER_OF_BYTES_ALLOC	600
 SUM_NUMBER_OF_BYTES_FREE	24
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	384
-HIGH_NUMBER_OF_BYTES_USED	408
+CURRENT_NUMBER_OF_BYTES_USED	576
+HIGH_NUMBER_OF_BYTES_USED	600
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3608576
-SUM_NUMBER_OF_BYTES_FREE	3088384
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	73728
+SUM_NUMBER_OF_BYTES_FREE	49152
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	520192
-HIGH_NUMBER_OF_BYTES_USED	2056192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	408
+SUM_NUMBER_OF_BYTES_ALLOC	600
 SUM_NUMBER_OF_BYTES_FREE	24
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	384
-HIGH_NUMBER_OF_BYTES_USED	408
+CURRENT_NUMBER_OF_BYTES_USED	576
+HIGH_NUMBER_OF_BYTES_USED	600
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1733,81 +1727,84 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1838,79 +1835,79 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1942,74 +1939,74 @@ USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -2039,60 +2036,60 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	408
+SUM_NUMBER_OF_BYTES_ALLOC	600
 SUM_NUMBER_OF_BYTES_FREE	24
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	384
-HIGH_NUMBER_OF_BYTES_USED	408
+CURRENT_NUMBER_OF_BYTES_USED	576
+HIGH_NUMBER_OF_BYTES_USED	600
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3608576
-SUM_NUMBER_OF_BYTES_FREE	3088384
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	73728
+SUM_NUMBER_OF_BYTES_FREE	49152
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	520192
-HIGH_NUMBER_OF_BYTES_USED	2056192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	408
+SUM_NUMBER_OF_BYTES_ALLOC	600
 SUM_NUMBER_OF_BYTES_FREE	24
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	384
-HIGH_NUMBER_OF_BYTES_USED	408
+CURRENT_NUMBER_OF_BYTES_USED	576
+HIGH_NUMBER_OF_BYTES_USED	600
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2110,9 +2107,8 @@ user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -2122,6 +2118,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -2132,365 +2129,366 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
 SUM_NUMBER_OF_BYTES_FREE	16
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
-SUM_NUMBER_OF_BYTES_ALLOC	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
 SUM_NUMBER_OF_BYTES_FREE	40
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	5
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	640
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	960
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
-SUM_NUMBER_OF_BYTES_ALLOC	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
 SUM_NUMBER_OF_BYTES_FREE	40
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	5
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	640
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	960
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2508,6 +2506,9 @@ user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -2517,335 +2518,335 @@ username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	128
+SUM_NUMBER_OF_BYTES_ALLOC	192
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	128
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	128
+LOW_NUMBER_OF_BYTES_USED	192
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	192
 username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	144
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	208
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	144
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	208
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	296
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	424
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	384
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	576
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	296
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	424
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	384
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	576
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2863,6 +2864,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	6
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -2874,311 +2877,311 @@ username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	144
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	208
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	144
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	208
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	424
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	616
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	424
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	616
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	2
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	256
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	384
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3196,6 +3199,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	6
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -3209,287 +3214,287 @@ username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
-SUM_NUMBER_OF_BYTES_ALLOC	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
 SUM_NUMBER_OF_BYTES_FREE	8
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	136
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	200
 username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	144
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	208
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	144
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	208
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	272
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	552
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	808
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	552
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	808
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	128
-HIGH_NUMBER_OF_BYTES_USED	680
+CURRENT_NUMBER_OF_BYTES_USED	192
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3507,6 +3512,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	6
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -3524,261 +3531,261 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	4
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	400
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	272
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	4
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	400
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	272
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3796,6 +3803,7 @@ user4	0	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	6
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -3814,261 +3822,261 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	4
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	400
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	272
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	4
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	400
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	272
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4208,157 +4216,157 @@ USER	user1
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	2
-SUM_NUMBER_OF_BYTES_ALLOC	136
-SUM_NUMBER_OF_BYTES_FREE	136
+SUM_NUMBER_OF_BYTES_ALLOC	200
+SUM_NUMBER_OF_BYTES_FREE	200
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	136
+HIGH_NUMBER_OF_BYTES_USED	200
 USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	4
-SUM_NUMBER_OF_BYTES_ALLOC	272
-SUM_NUMBER_OF_BYTES_FREE	272
+SUM_NUMBER_OF_BYTES_ALLOC	400
+SUM_NUMBER_OF_BYTES_FREE	400
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	4
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	272
+HIGH_NUMBER_OF_BYTES_USED	400
 USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4595,60 +4603,60 @@ HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4897,48 +4905,48 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7712768
-SUM_NUMBER_OF_BYTES_FREE	3608576
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
-SUM_NUMBER_OF_BYTES_ALLOC	680
-SUM_NUMBER_OF_BYTES_FREE	680
+SUM_NUMBER_OF_BYTES_ALLOC	1000
+SUM_NUMBER_OF_BYTES_FREE	1000
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	10
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	680
+HIGH_NUMBER_OF_BYTES_USED	1000
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5187,26 +5195,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4104192
+SUM_NUMBER_OF_BYTES_ALLOC	24576
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4104192
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	24576
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5221,14 +5229,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5373,26 +5381,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4104192
+SUM_NUMBER_OF_BYTES_ALLOC	24576
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4104192
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	24576
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5407,14 +5415,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5459,26 +5467,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4104192
+SUM_NUMBER_OF_BYTES_ALLOC	24576
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4104192
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	24576
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5493,14 +5501,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5541,26 +5549,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4104192
+SUM_NUMBER_OF_BYTES_ALLOC	24576
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4104192
-CURRENT_NUMBER_OF_BYTES_USED	4104192
-HIGH_NUMBER_OF_BYTES_USED	4104192
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	24576
+CURRENT_NUMBER_OF_BYTES_USED	24576
+HIGH_NUMBER_OF_BYTES_USED	24576
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5575,14 +5583,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5592,5 +5600,3 @@ root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
index f935a278cd7..b5c8e1cd3c7 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -42,14 +30,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -76,14 +64,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -92,7 +80,9 @@ root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -168,14 +158,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -202,14 +192,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -219,9 +209,8 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -232,6 +221,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -250,14 +240,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -282,14 +272,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -307,26 +297,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -341,14 +331,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -358,7 +348,9 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -377,14 +369,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -431,14 +423,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -480,26 +472,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -514,14 +506,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -532,9 +524,8 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -545,6 +536,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -563,14 +555,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -587,14 +579,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -617,14 +609,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -641,14 +633,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -671,21 +663,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -705,7 +697,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -738,14 +730,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -762,14 +754,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -792,14 +784,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -816,14 +808,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -846,21 +838,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -880,7 +872,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -893,7 +885,9 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -912,14 +906,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -936,14 +930,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -988,14 +982,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1012,14 +1006,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1066,21 +1060,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -1100,7 +1094,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1114,9 +1108,8 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -1127,6 +1120,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -1145,14 +1139,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1169,14 +1163,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1193,14 +1187,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1221,14 +1215,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1245,14 +1239,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1269,14 +1263,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1294,26 +1288,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1328,14 +1322,14 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1347,7 +1341,10 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1366,14 +1363,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1390,14 +1387,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1414,14 +1411,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1464,14 +1461,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1488,14 +1485,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1512,14 +1509,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1561,26 +1558,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1595,14 +1592,14 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1615,9 +1612,8 @@ user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -1627,6 +1623,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -1637,6 +1634,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -1655,14 +1653,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1679,14 +1677,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1703,14 +1701,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1727,14 +1725,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -1753,14 +1751,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1777,14 +1775,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1801,14 +1799,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -1825,14 +1823,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1850,26 +1848,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -1884,14 +1882,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1904,6 +1902,9 @@ user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -1925,14 +1926,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1949,14 +1950,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1973,14 +1974,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -1999,14 +2000,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2023,14 +2024,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2047,14 +2048,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2071,14 +2072,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2096,26 +2097,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -2130,14 +2131,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2150,6 +2151,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	6
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -2173,14 +2176,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2197,14 +2200,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -2223,14 +2226,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2247,14 +2250,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2271,14 +2274,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2295,14 +2298,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2320,26 +2323,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -2354,14 +2357,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2374,6 +2377,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	6
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -2399,14 +2404,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -2425,14 +2430,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2449,14 +2454,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2473,14 +2478,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2497,14 +2502,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2522,26 +2527,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -2556,14 +2561,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2576,6 +2581,8 @@ user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	6
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -2605,14 +2612,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2629,14 +2636,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2653,14 +2660,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2677,14 +2684,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2702,26 +2709,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2736,14 +2743,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2756,6 +2763,7 @@ user4	0	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	6
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -2786,14 +2794,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2810,14 +2818,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2834,14 +2842,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2858,14 +2866,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2883,26 +2891,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2917,14 +2925,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2967,14 +2975,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2991,14 +2999,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3015,14 +3023,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3039,14 +3047,14 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3064,26 +3072,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3098,14 +3106,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3245,26 +3253,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3279,14 +3287,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3426,26 +3434,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3460,14 +3468,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3607,26 +3615,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3641,14 +3649,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3788,26 +3796,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3822,14 +3830,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3873,26 +3881,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3907,14 +3915,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3954,26 +3962,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3988,14 +3996,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -4004,5 +4012,3 @@ root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result
index 445d6755f06..cc0e0c03dcf 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -52,14 +40,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -67,7 +55,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -153,14 +143,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -169,9 +159,8 @@ root	1	1
 user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -182,6 +171,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -200,14 +190,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -232,27 +222,27 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -267,14 +257,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -283,7 +273,9 @@ root	1	1
 user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -302,14 +294,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -356,14 +348,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -391,16 +383,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -415,14 +407,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -432,9 +424,8 @@ user1	1	1
 user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -445,6 +436,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -463,14 +455,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -487,14 +479,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -517,14 +509,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -541,27 +533,27 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -581,7 +573,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -613,14 +605,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -637,14 +629,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -667,14 +659,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -691,27 +683,27 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -731,7 +723,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -743,7 +735,9 @@ user1	1	1
 user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -762,14 +756,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -786,14 +780,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -838,14 +832,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -862,14 +856,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -897,16 +891,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -926,7 +920,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -939,9 +933,8 @@ user2	1	1
 user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -952,6 +945,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -970,14 +964,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -994,14 +988,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1018,14 +1012,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1046,14 +1040,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1070,14 +1064,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1094,27 +1088,27 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1129,14 +1123,14 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1147,7 +1141,10 @@ user2	1	1
 user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1166,14 +1163,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1190,14 +1187,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1214,14 +1211,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1264,14 +1261,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1288,14 +1285,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1312,14 +1309,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1347,16 +1344,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1371,14 +1368,14 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1390,9 +1387,8 @@ user3	1	1
 user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -1402,6 +1398,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -1412,6 +1409,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -1430,14 +1428,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1454,14 +1452,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1478,14 +1476,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1502,14 +1500,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -1528,14 +1526,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1552,14 +1550,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1576,14 +1574,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -1600,27 +1598,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -1635,14 +1633,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1654,6 +1652,9 @@ user3	1	1
 user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -1675,14 +1676,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1699,14 +1700,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1723,14 +1724,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -1749,14 +1750,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1773,14 +1774,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1797,14 +1798,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -1821,27 +1822,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -1856,14 +1857,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1875,6 +1876,8 @@ user3	1	1
 user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -1898,14 +1901,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1922,14 +1925,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -1948,14 +1951,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1972,14 +1975,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1996,14 +1999,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2020,27 +2023,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -2055,14 +2058,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2074,6 +2077,8 @@ user3	1	1
 user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -2099,14 +2104,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 USER	user1
@@ -2125,14 +2130,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2149,14 +2154,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2173,14 +2178,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2197,27 +2202,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -2232,14 +2237,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2251,6 +2256,8 @@ user3	0	1
 user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -2280,14 +2287,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2304,14 +2311,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2328,14 +2335,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2352,27 +2359,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2387,14 +2394,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2406,6 +2413,7 @@ user3	0	1
 user4	0	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -2436,14 +2444,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2460,14 +2468,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2484,14 +2492,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2508,27 +2516,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2543,14 +2551,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2592,14 +2600,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2616,14 +2624,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2640,14 +2648,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2664,27 +2672,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2699,14 +2707,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2831,16 +2839,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2855,14 +2863,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2987,16 +2995,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3011,14 +3019,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3143,16 +3151,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3167,14 +3175,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3299,16 +3307,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3323,14 +3331,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3359,16 +3367,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3383,14 +3391,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3415,16 +3423,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3439,14 +3447,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3454,5 +3462,3 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result
index 21ce08a937e..8b24b5b565b 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -42,14 +30,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -76,14 +64,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -91,7 +79,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -143,14 +133,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -177,14 +167,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -192,9 +182,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -205,6 +194,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -223,14 +213,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -256,26 +246,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -290,14 +280,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -305,7 +295,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -324,14 +316,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -379,26 +371,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -413,14 +405,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -428,9 +420,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -441,6 +432,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -459,14 +451,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -483,14 +475,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -519,21 +511,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -553,7 +545,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -583,14 +575,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -607,14 +599,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -643,21 +635,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -677,7 +669,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -687,7 +679,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -706,14 +700,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -730,14 +724,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -788,21 +782,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -822,7 +816,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -832,9 +826,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -845,6 +838,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -863,14 +857,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -887,14 +881,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -911,14 +905,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -940,26 +934,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -974,14 +968,14 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -989,7 +983,10 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1008,14 +1005,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1032,14 +1029,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1056,14 +1053,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1107,26 +1104,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1141,14 +1138,14 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1156,9 +1153,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -1168,6 +1164,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -1178,6 +1175,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -1196,14 +1194,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1220,14 +1218,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1244,14 +1242,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1268,14 +1266,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
@@ -1295,26 +1293,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -1329,14 +1327,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1344,6 +1342,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -1365,14 +1366,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1389,14 +1390,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1413,14 +1414,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
@@ -1440,26 +1441,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -1474,14 +1475,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1489,6 +1490,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	6
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -1512,14 +1515,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1536,14 +1539,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
@@ -1563,26 +1566,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -1597,14 +1600,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1612,6 +1615,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	6
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -1637,14 +1642,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
@@ -1664,26 +1669,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -1698,14 +1703,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1713,6 +1718,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	6
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -1743,26 +1750,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1777,14 +1784,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1792,6 +1799,7 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	6
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -1823,26 +1831,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1857,14 +1865,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1903,26 +1911,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1937,14 +1945,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1983,26 +1991,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2017,14 +2025,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2063,26 +2071,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2097,14 +2105,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2143,26 +2151,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -2177,14 +2185,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2223,26 +2231,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -2257,14 +2265,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2303,26 +2311,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -2337,14 +2345,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2383,26 +2391,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -2417,14 +2425,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2432,5 +2440,3 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
index fc17b177f57..45cbaf88372 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -52,21 +40,23 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -128,23 +118,22 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -155,6 +144,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -173,14 +163,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -192,16 +182,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -216,21 +206,23 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -249,14 +241,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -290,16 +282,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -314,23 +306,22 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -341,6 +332,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -359,14 +351,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -383,14 +375,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -400,16 +392,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -429,7 +421,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -458,14 +450,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -482,14 +474,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -499,16 +491,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -528,7 +520,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -537,7 +529,9 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -556,14 +550,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -580,14 +574,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -619,16 +613,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -648,7 +642,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -657,9 +651,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -670,6 +663,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -688,14 +682,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -712,14 +706,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -736,14 +730,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -751,16 +745,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -775,21 +769,24 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -808,14 +805,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -832,14 +829,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -856,14 +853,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -893,16 +890,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -917,23 +914,22 @@ HIGH_NUMBER_OF_BYTES_USED	784
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -943,6 +939,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -953,6 +950,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -971,14 +969,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -995,14 +993,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1019,14 +1017,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1043,29 +1041,29 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -1080,20 +1078,23 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -1115,14 +1116,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1139,14 +1140,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1163,29 +1164,29 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -1200,20 +1201,22 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -1237,14 +1240,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1261,29 +1264,29 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -1298,20 +1301,22 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -1337,29 +1342,29 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -1374,20 +1379,22 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -1404,16 +1411,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1428,20 +1435,21 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -1459,16 +1467,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1483,14 +1491,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1514,16 +1522,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1538,14 +1546,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1569,16 +1577,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1593,14 +1601,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1624,16 +1632,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -1648,14 +1656,14 @@ HIGH_NUMBER_OF_BYTES_USED	1328
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1679,16 +1687,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -1703,14 +1711,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1734,16 +1742,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -1758,14 +1766,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1789,16 +1797,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -1813,14 +1821,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1844,16 +1852,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -1868,19 +1876,17 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
index bec6d10256e..35d528bf63c 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -52,14 +40,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -68,7 +56,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -180,14 +170,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -198,9 +188,8 @@ root	1	1
 user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -211,6 +200,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -229,14 +219,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -262,14 +252,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -287,27 +277,27 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -322,14 +312,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -340,7 +330,9 @@ root	1	1
 user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -359,14 +351,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -414,14 +406,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -465,14 +457,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -500,16 +492,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -524,14 +516,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -544,9 +536,8 @@ user1	1	1
 user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -557,6 +548,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -575,14 +567,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -599,14 +591,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -630,14 +622,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -656,14 +648,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -681,14 +673,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -705,27 +697,27 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -745,7 +737,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -780,14 +772,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -804,14 +796,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -835,14 +827,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -861,14 +853,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -886,14 +878,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -910,27 +902,27 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -950,7 +942,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -965,7 +957,9 @@ user1	1	1
 user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -984,14 +978,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1008,14 +1002,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1061,14 +1055,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1087,14 +1081,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1138,14 +1132,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1162,14 +1156,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1197,16 +1191,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -1226,7 +1220,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1243,9 +1237,8 @@ user2	1	1
 user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -1256,6 +1249,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -1274,14 +1268,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1298,14 +1292,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1322,14 +1316,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1351,14 +1345,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1377,14 +1371,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1403,14 +1397,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -1428,14 +1422,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1452,14 +1446,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1476,27 +1470,27 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1511,14 +1505,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1533,7 +1527,10 @@ user2	1	1
 user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1552,14 +1549,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1576,14 +1573,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1600,14 +1597,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1651,14 +1648,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1677,14 +1674,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1703,14 +1700,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1754,14 +1751,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1778,14 +1775,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1802,14 +1799,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1837,16 +1834,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1861,14 +1858,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1885,9 +1882,8 @@ user3	1	1
 user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -1897,6 +1893,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -1907,6 +1904,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -1925,14 +1923,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1949,14 +1947,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1973,14 +1971,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1997,14 +1995,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2024,14 +2022,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2050,14 +2048,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2076,14 +2074,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2102,14 +2100,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -2127,14 +2125,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2151,14 +2149,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2175,14 +2173,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2199,27 +2197,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -2234,14 +2232,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2258,6 +2256,9 @@ user3	1	1
 user4	2	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -2279,14 +2280,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2303,14 +2304,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2327,14 +2328,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2354,14 +2355,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2380,14 +2381,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2406,14 +2407,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2432,14 +2433,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -2457,14 +2458,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2481,14 +2482,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2505,14 +2506,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2529,27 +2530,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -2564,14 +2565,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2588,6 +2589,8 @@ user3	1	1
 user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -2611,14 +2614,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2635,14 +2638,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2662,14 +2665,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2688,14 +2691,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2714,14 +2717,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2740,14 +2743,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -2765,14 +2768,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2789,14 +2792,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2813,14 +2816,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -2837,27 +2840,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -2872,14 +2875,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2896,6 +2899,8 @@ user3	1	1
 user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -2921,14 +2926,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2948,14 +2953,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2974,14 +2979,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3000,14 +3005,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3026,14 +3031,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3051,14 +3056,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3075,14 +3080,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3099,14 +3104,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3123,27 +3128,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -3158,14 +3163,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3182,6 +3187,8 @@ user3	0	1
 user4	1	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -3212,14 +3219,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3238,14 +3245,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3264,14 +3271,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3290,14 +3297,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3315,14 +3322,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3339,14 +3346,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3363,14 +3370,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3387,27 +3394,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3422,14 +3429,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3446,6 +3453,7 @@ user3	0	1
 user4	0	2
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -3477,14 +3485,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3503,14 +3511,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3529,14 +3537,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -3555,14 +3563,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 USER	user1
 EVENT_NAME	memory/sql/User_level_lock
@@ -3580,14 +3588,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3604,14 +3612,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3628,14 +3636,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3652,27 +3660,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3687,14 +3695,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3845,14 +3853,14 @@ USER	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3869,14 +3877,14 @@ USER	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -3893,14 +3901,14 @@ USER	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
@@ -3917,27 +3925,27 @@ USER	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3952,14 +3960,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4193,16 +4201,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -4217,14 +4225,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4458,16 +4466,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -4482,14 +4490,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4723,16 +4731,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -4747,14 +4755,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4884,16 +4892,16 @@ HIGH_NUMBER_OF_BYTES_USED	0
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -4908,14 +4916,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4945,16 +4953,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -4969,14 +4977,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5002,16 +5010,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -5026,14 +5034,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5042,5 +5050,3 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
index 6191cbf6f67..1f800ce4ba6 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -42,14 +30,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -76,14 +64,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -92,7 +80,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -170,14 +160,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
 COUNT_ALLOC	0
@@ -204,14 +194,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -221,9 +211,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -234,6 +223,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -252,14 +242,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -285,14 +275,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -311,26 +301,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -345,14 +335,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -362,7 +352,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -381,14 +373,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -436,14 +428,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -488,26 +480,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -522,14 +514,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -540,9 +532,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -553,6 +544,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -571,14 +563,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -595,14 +587,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -626,14 +618,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -652,14 +644,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -683,21 +675,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -717,7 +709,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -750,14 +742,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -774,14 +766,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -805,14 +797,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -831,14 +823,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -862,21 +854,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -896,7 +888,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -909,7 +901,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -928,14 +922,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -952,14 +946,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1005,14 +999,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1031,14 +1025,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1088,21 +1082,21 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -1122,7 +1116,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -1136,9 +1130,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -1149,6 +1142,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -1167,14 +1161,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1191,14 +1185,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1215,14 +1209,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1244,14 +1238,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1270,14 +1264,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1296,14 +1290,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -1322,26 +1316,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1356,14 +1350,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1375,7 +1369,10 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1394,14 +1391,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1418,14 +1415,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1442,14 +1439,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1493,14 +1490,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1519,14 +1516,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1545,14 +1542,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1597,26 +1594,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1631,14 +1628,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1651,9 +1648,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -1663,6 +1659,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -1673,6 +1670,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -1691,14 +1689,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1715,14 +1713,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1739,14 +1737,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1763,14 +1761,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -1790,14 +1788,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1816,14 +1814,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1842,14 +1840,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1868,14 +1866,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -1894,26 +1892,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -1928,14 +1926,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1948,6 +1946,9 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	6	6
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -1969,14 +1970,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1993,14 +1994,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2017,14 +2018,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2044,14 +2045,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2070,14 +2071,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2096,14 +2097,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2122,14 +2123,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -2148,26 +2149,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -2182,14 +2183,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2202,6 +2203,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	6
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -2225,14 +2228,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -2249,14 +2252,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2276,14 +2279,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2302,14 +2305,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2328,14 +2331,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2354,14 +2357,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -2380,26 +2383,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -2414,14 +2417,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2434,6 +2437,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	6
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -2459,14 +2464,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2486,14 +2491,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2512,14 +2517,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2538,14 +2543,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2564,14 +2569,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -2590,26 +2595,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -2624,14 +2629,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2644,6 +2649,8 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	6
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -2674,14 +2681,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2700,14 +2707,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2726,14 +2733,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2752,14 +2759,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -2778,26 +2785,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2812,14 +2819,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2832,6 +2839,7 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	6
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -2863,14 +2871,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2889,14 +2897,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2915,14 +2923,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2941,14 +2949,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 HOST	localhost
@@ -2967,26 +2975,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3001,14 +3009,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3156,26 +3164,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3190,14 +3198,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3345,26 +3353,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3379,14 +3387,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3534,26 +3542,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3568,14 +3576,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3723,26 +3731,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3757,14 +3765,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3808,26 +3816,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3842,14 +3850,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3889,26 +3897,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3923,14 +3931,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3970,26 +3978,26 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -4004,14 +4012,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4020,5 +4028,3 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	1
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
index 50324598db7..b1ac5f24ec9 100644
--- a/mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show global status like "performance_schema_memory_classes_lost";
 Variable_name	Value
 Performance_schema_memory_classes_lost	0
@@ -52,14 +40,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -67,7 +55,9 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con1, localhost, user1, , ;
 "================== con1 connected =================="
+connection default;
 "================== Step 2 =================="
 call dump_thread();
 username	user1
@@ -155,14 +145,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -171,9 +161,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con1;
 set GLOBAL query_cache_size=1000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_1", 10);
 get_lock("marker_1", 10)
 1
@@ -184,6 +173,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con1 marker =================="
+connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	user1
@@ -202,14 +192,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 status	not found
 username	user3
@@ -235,28 +225,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -271,14 +261,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -287,7 +277,9 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con2, localhost, user2, , ;
 "================== con2 connected =================="
+connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	user1
@@ -306,14 +298,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -361,14 +353,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -399,16 +391,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	1040384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	1040384
-HIGH_NUMBER_OF_BYTES_USED	1040384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
 COUNT_FREE	1
@@ -423,14 +415,14 @@ HIGH_NUMBER_OF_BYTES_USED	272
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	4
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7141
+SUM_NUMBER_OF_BYTES_ALLOC	7120
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	4
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	7141
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	7120
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -440,9 +432,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con2;
 set GLOBAL query_cache_size=2000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_2", 10);
 get_lock("marker_2", 10)
 1
@@ -453,6 +444,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con2 marker =================="
+connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	user1
@@ -471,14 +463,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -495,14 +487,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -526,14 +518,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -552,28 +544,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -593,7 +585,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -625,14 +617,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -649,14 +641,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 status	not found
 username	user4
@@ -680,14 +672,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -706,28 +698,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -747,7 +739,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -759,7 +751,9 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con3, localhost, user3, , ;
 "================== con3 connected =================="
+connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	user1
@@ -778,14 +772,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -802,14 +796,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -855,14 +849,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -881,14 +875,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -919,16 +913,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	6
-COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	3104768
-SUM_NUMBER_OF_BYTES_FREE	1040384
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	2064384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	4
 COUNT_FREE	2
@@ -948,7 +942,7 @@ SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	7
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
 HIGH_NUMBER_OF_BYTES_USED	14144
 execute dump_accounts;
@@ -961,9 +955,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con3;
 set GLOBAL query_cache_size=500*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_3", 10);
 get_lock("marker_3", 10)
 1
@@ -974,6 +967,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con3 marker =================="
+connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	user1
@@ -992,14 +986,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1016,14 +1010,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1040,14 +1034,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 status	not found
 execute dump_memory_account;
@@ -1069,14 +1063,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1095,14 +1089,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1121,28 +1115,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1157,14 +1151,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1175,7 +1169,10 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connect  con4, localhost, user4, , ;
+connect  con5, localhost, user4, , ;
 "================== con4/con5 (both user4) connected =================="
+connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	user1
@@ -1194,14 +1191,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1218,14 +1215,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1242,14 +1239,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
@@ -1293,14 +1290,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1319,14 +1316,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1345,14 +1342,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1383,16 +1380,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	9
-COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	3633152
-SUM_NUMBER_OF_BYTES_FREE	3104768
+COUNT_ALLOC	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	528384
-HIGH_NUMBER_OF_BYTES_USED	2064384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	6
 COUNT_FREE	3
@@ -1407,14 +1404,14 @@ HIGH_NUMBER_OF_BYTES_USED	816
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	10
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	21147
+SUM_NUMBER_OF_BYTES_ALLOC	21168
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	10
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	21147
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	21168
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1426,9 +1423,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con4;
 set GLOBAL query_cache_size=4000*1024;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 select get_lock("marker_4", 10);
 get_lock("marker_4", 10)
 1
@@ -1438,6 +1434,7 @@ release_lock("marker_4")
 set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
+connection con5;
 select get_lock("marker_5", 10);
 get_lock("marker_5", 10)
 1
@@ -1448,6 +1445,7 @@ set @v1 = repeat("a", 1000);
 set @v2 = repeat("b", 2000);
 set @v3 = repeat("c", 4000);
 "================== con4/con5 marker =================="
+connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	user1
@@ -1466,14 +1464,14 @@ username	user1
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user2
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	1
@@ -1490,14 +1488,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1514,14 +1512,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1538,14 +1536,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -1565,14 +1563,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1591,14 +1589,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1617,14 +1615,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1643,28 +1641,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	6
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	14006
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	5
@@ -1679,14 +1677,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	35153
+SUM_NUMBER_OF_BYTES_ALLOC	35216
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	16
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	35153
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	35216
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1698,6 +1696,9 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con1;
+disconnect con5;
+connection default;
 "================== con1/con5 disconnected =================="
 "================== Step 10 =================="
 call dump_thread();
@@ -1719,14 +1720,14 @@ username	user2
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	3
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	7003
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+LOW_NUMBER_OF_BYTES_USED	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user3
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1743,14 +1744,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1767,14 +1768,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -1794,14 +1795,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1820,14 +1821,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1846,14 +1847,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -1872,28 +1873,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	7
@@ -1908,14 +1909,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	10
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	21147
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	21168
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1927,6 +1928,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con2;
+connection default;
 "================== con2 disconnected =================="
 "================== Step 11 =================="
 call dump_thread();
@@ -1950,14 +1953,14 @@ username	user3
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 username	user4
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	2
@@ -1974,14 +1977,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2001,14 +2004,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2027,14 +2030,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2053,14 +2056,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2079,28 +2082,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	8
@@ -2115,14 +2118,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	21009
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	7
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
 CURRENT_NUMBER_OF_BYTES_USED	14144
-HIGH_NUMBER_OF_BYTES_USED	35153
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2134,6 +2137,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con3;
+connection default;
 "================== con3 disconnected =================="
 "================== Step 12 =================="
 call dump_thread();
@@ -2159,14 +2164,14 @@ username	user4
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	7003
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
 execute dump_memory_account;
 USER	user1
 HOST	localhost
@@ -2186,14 +2191,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2212,14 +2217,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2238,14 +2243,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2264,28 +2269,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	3
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	7003
-HIGH_NUMBER_OF_BYTES_USED	14006
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	9
@@ -2300,14 +2305,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	12
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	28012
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	4
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	7141
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	7120
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2319,6 +2324,8 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+disconnect con4;
+connection default;
 "================== con4 disconnected =================="
 "================== Step 13 =================="
 call dump_thread();
@@ -2349,14 +2356,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2375,14 +2382,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2401,14 +2408,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2427,28 +2434,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2463,14 +2470,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2482,6 +2489,7 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection default;
 truncate performance_schema.memory_summary_by_thread_by_event_name;
 "================== MEMORY_BY_THREAD truncated =================="
 "================== Step 14 =================="
@@ -2513,14 +2521,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user2
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2539,14 +2547,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user3
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2565,14 +2573,14 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	3
 COUNT_FREE	3
-SUM_NUMBER_OF_BYTES_ALLOC	7003
-SUM_NUMBER_OF_BYTES_FREE	7003
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	7024
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	3
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	7003
+HIGH_NUMBER_OF_BYTES_USED	7024
 USER	user4
 HOST	localhost
 EVENT_NAME	memory/sql/User_level_lock
@@ -2591,28 +2599,28 @@ HOST	localhost
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	6
 COUNT_FREE	6
-SUM_NUMBER_OF_BYTES_ALLOC	14006
-SUM_NUMBER_OF_BYTES_FREE	14006
+SUM_NUMBER_OF_BYTES_ALLOC	14048
+SUM_NUMBER_OF_BYTES_FREE	14048
 LOW_COUNT_USED	0
 CURRENT_COUNT_USED	0
 HIGH_COUNT_USED	6
 LOW_NUMBER_OF_BYTES_USED	0
 CURRENT_NUMBER_OF_BYTES_USED	0
-HIGH_NUMBER_OF_BYTES_USED	14006
+HIGH_NUMBER_OF_BYTES_USED	14048
 execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2627,14 +2635,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2767,16 +2775,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2791,14 +2799,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2931,16 +2939,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -2955,14 +2963,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3095,16 +3103,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	12
-COUNT_FREE	9
-SUM_NUMBER_OF_BYTES_ALLOC	7745536
-SUM_NUMBER_OF_BYTES_FREE	3633152
+COUNT_ALLOC	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
 LOW_COUNT_USED	0
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
 LOW_NUMBER_OF_BYTES_USED	0
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	10
 COUNT_FREE	10
@@ -3119,14 +3127,14 @@ HIGH_NUMBER_OF_BYTES_USED	1360
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	16
 COUNT_FREE	15
-SUM_NUMBER_OF_BYTES_ALLOC	35153
-SUM_NUMBER_OF_BYTES_FREE	35015
+SUM_NUMBER_OF_BYTES_ALLOC	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	16
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	35153
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	35216
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3259,16 +3267,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3283,14 +3291,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3319,16 +3327,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3343,14 +3351,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3375,16 +3383,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3399,14 +3407,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3431,16 +3439,16 @@ execute dump_memory_user;
 execute dump_memory_host;
 execute dump_memory_global;
 EVENT_NAME	memory/sql/Query_cache
-COUNT_ALLOC	3
+COUNT_ALLOC	2
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	4112384
+SUM_NUMBER_OF_BYTES_ALLOC	32768
 SUM_NUMBER_OF_BYTES_FREE	0
-LOW_COUNT_USED	3
-CURRENT_COUNT_USED	3
-HIGH_COUNT_USED	3
-LOW_NUMBER_OF_BYTES_USED	4112384
-CURRENT_NUMBER_OF_BYTES_USED	4112384
-HIGH_NUMBER_OF_BYTES_USED	4112384
+LOW_COUNT_USED	2
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	32768
+CURRENT_NUMBER_OF_BYTES_USED	32768
+HIGH_NUMBER_OF_BYTES_USED	32768
 EVENT_NAME	memory/sql/User_level_lock
 COUNT_ALLOC	0
 COUNT_FREE	0
@@ -3455,14 +3463,14 @@ HIGH_NUMBER_OF_BYTES_USED	0
 EVENT_NAME	memory/sql/user_var_entry::value
 COUNT_ALLOC	1
 COUNT_FREE	0
-SUM_NUMBER_OF_BYTES_ALLOC	138
+SUM_NUMBER_OF_BYTES_ALLOC	96
 SUM_NUMBER_OF_BYTES_FREE	0
 LOW_COUNT_USED	1
 CURRENT_COUNT_USED	1
 HIGH_COUNT_USED	1
-LOW_NUMBER_OF_BYTES_USED	138
-CURRENT_NUMBER_OF_BYTES_USED	138
-HIGH_NUMBER_OF_BYTES_USED	138
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	96
+HIGH_NUMBER_OF_BYTES_USED	96
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3470,5 +3478,3 @@ execute dump_users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
diff --git a/mysql-test/suite/perfschema/r/memory_table_io.result b/mysql-test/suite/perfschema/r/memory_table_io.result
index c86e812840f..033c355dfa3 100644
--- a/mysql-test/suite/perfschema/r/memory_table_io.result
+++ b/mysql-test/suite/perfschema/r/memory_table_io.result
@@ -70,100 +70,51 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -172,17 +123,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/merge_table_io.result b/mysql-test/suite/perfschema/r/merge_table_io.result
index 09630e0d86d..e65cc45dc84 100644
--- a/mysql-test/suite/perfschema/r/merge_table_io.result
+++ b/mysql-test/suite/perfschema/r/merge_table_io.result
@@ -96,110 +96,57 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -208,17 +155,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index 146c7976adb..bed8d93af25 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -96,10 +96,8 @@ show global variables like "performance_schema_max_thread_instances";
 Variable_name	Value
 performance_schema_max_thread_instances	200
 explain select * from performance_schema.threads;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	threads	NULL	ALL	NULL	NULL	NULL	NULL	256	100.00	NULL
-Warnings:
-Note	1003	/* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID` from `performance_schema`.`threads`
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	threads	ALL	NULL	NULL	NULL	NULL	256	
 use performance_schema;
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
diff --git a/mysql-test/suite/perfschema/r/multi_table_io.result b/mysql-test/suite/perfschema/r/multi_table_io.result
index ddb5d7e4af3..54dc0fba3d1 100644
--- a/mysql-test/suite/perfschema/r/multi_table_io.result
+++ b/mysql-test/suite/perfschema/r/multi_table_io.result
@@ -52,67 +52,38 @@ where event_name like 'wait/io/table/%'
   and object_schema in ('test','test1')
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	delete	NULL
-<<<<<<< HEAD
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-show status like 'performance_schema_%';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test1	t2	delete	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	update	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test1	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test1	t2	delete	1
 show global status like 'performance_schema_%';
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -121,17 +92,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/myisam_table_io.result b/mysql-test/suite/perfschema/r/myisam_table_io.result
index 9ec5f6feb8f..9e5d95683ed 100644
--- a/mysql-test/suite/perfschema/r/myisam_table_io.result
+++ b/mysql-test/suite/perfschema/r/myisam_table_io.result
@@ -70,98 +70,51 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -170,17 +123,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result
index 4730b9a2090..e3137d634a6 100644
--- a/mysql-test/suite/perfschema/r/nesting.result
+++ b/mysql-test/suite/perfschema/r/nesting.result
@@ -1,14 +1,4 @@
-<<<<<<< HEAD
 connect  con1, localhost, user1, , ;
-=======
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-"================== con1 connected =================="
->>>>>>> merge-perfschema-5.7
 select "MARKER_BEGIN" as marker;
 marker
 MARKER_BEGIN
@@ -124,28 +114,21 @@ 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
-<<<<<<< HEAD
 0	20	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	4	stage/sql/Init	(stage)	STATEMENT	0
-=======
-<<<<<<< HEAD
-0	18	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	4	stage/sql/init	(stage)	STATEMENT	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+1	4	stage/sql/starting	(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
-<<<<<<< HEAD
-8	8	stage/sql/Init	(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 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
+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
@@ -154,20 +137,20 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 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
+23	26	stage/sql/starting	(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
+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
+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
+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
@@ -176,20 +159,20 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 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
+45	48	stage/sql/starting	(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
+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
+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
+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
@@ -198,125 +181,59 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 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;
-=======
-=======
-0	17	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	5	stage/sql/starting	(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/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	1
-5	5	wait/io/file/sql/query_log	write	STAGE	1
-6	6	stage/sql/checking permissions	(stage)	STATEMENT	0
-7	7	stage/sql/Opening tables	(stage)	STATEMENT	0
->>>>>>> merge-perfschema-5.7
-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
-<<<<<<< HEAD
-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	76	statement/sql/select	select "This is the first part of a multi query" as payload;
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-67	71	stage/sql/Init	(stage)	STATEMENT	66
+67	71	stage/sql/starting	(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
+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
+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
+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_kill	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
-87	89	stage/sql/Init	(stage)	STATEMENT	86
+87	89	stage/sql/starting	(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
+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
+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
+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_kill	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
+105	106	stage/sql/starting	(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
+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
+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
+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
@@ -325,20 +242,20 @@ select "With a third part to make things complete" as payload	NULL	NULL
 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
+125	128	stage/sql/starting	(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
+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
+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
+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
@@ -346,120 +263,3 @@ select "With a third part to make things complete" as payload	NULL	NULL
 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;
-=======
-14	15	stage/sql/freeing items	(stage)	STATEMENT	0
-15	15	wait/io/socket/sql/client_connection	send	STAGE	14
-16	17	stage/sql/cleaning up	(stage)	STATEMENT	0
-17	17	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	16
-18	18	idle	idle	NULL	NULL
-19	36	statement/sql/select	select "This is simple statement one" as payload	NULL	NULL
-20	24	stage/sql/starting	(stage)	STATEMENT	19
-21	21	wait/io/socket/sql/client_connection	recv	STAGE	20
-22	22	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	20
-23	23	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	20
-24	24	wait/io/file/sql/query_log	write	STAGE	20
-25	25	stage/sql/checking permissions	(stage)	STATEMENT	19
-26	26	stage/sql/Opening tables	(stage)	STATEMENT	19
-27	27	stage/sql/init	(stage)	STATEMENT	19
-28	28	stage/sql/optimizing	(stage)	STATEMENT	19
-29	29	stage/sql/executing	(stage)	STATEMENT	19
-30	30	stage/sql/end	(stage)	STATEMENT	19
-31	31	stage/sql/query end	(stage)	STATEMENT	19
-32	32	stage/sql/closing tables	(stage)	STATEMENT	19
-33	34	stage/sql/freeing items	(stage)	STATEMENT	19
-34	34	wait/io/socket/sql/client_connection	send	STAGE	33
-35	36	stage/sql/cleaning up	(stage)	STATEMENT	19
-36	36	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	35
-37	37	idle	idle	NULL	NULL
-38	55	statement/sql/select	select "This is simple statement two" as payload	NULL	NULL
-39	43	stage/sql/starting	(stage)	STATEMENT	38
-40	40	wait/io/socket/sql/client_connection	recv	STAGE	39
-41	41	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	39
-42	42	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	39
-43	43	wait/io/file/sql/query_log	write	STAGE	39
-44	44	stage/sql/checking permissions	(stage)	STATEMENT	38
-45	45	stage/sql/Opening tables	(stage)	STATEMENT	38
-46	46	stage/sql/init	(stage)	STATEMENT	38
-47	47	stage/sql/optimizing	(stage)	STATEMENT	38
-48	48	stage/sql/executing	(stage)	STATEMENT	38
-49	49	stage/sql/end	(stage)	STATEMENT	38
-50	50	stage/sql/query end	(stage)	STATEMENT	38
-51	51	stage/sql/closing tables	(stage)	STATEMENT	38
-52	53	stage/sql/freeing items	(stage)	STATEMENT	38
-53	53	wait/io/socket/sql/client_connection	send	STAGE	52
-54	55	stage/sql/cleaning up	(stage)	STATEMENT	38
-55	55	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	54
-56	56	idle	idle	NULL	NULL
-57	73	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
-58	63	stage/sql/starting	(stage)	STATEMENT	57
-59	59	wait/io/socket/sql/client_connection	recv	STAGE	58
-60	60	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	58
-61	61	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	58
-62	62	wait/io/file/sql/query_log	write	STAGE	58
-63	63	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	58
-64	64	stage/sql/checking permissions	(stage)	STATEMENT	57
-65	65	stage/sql/Opening tables	(stage)	STATEMENT	57
-66	66	stage/sql/init	(stage)	STATEMENT	57
-67	67	stage/sql/optimizing	(stage)	STATEMENT	57
-68	68	stage/sql/executing	(stage)	STATEMENT	57
-69	69	stage/sql/end	(stage)	STATEMENT	57
-70	70	stage/sql/query end	(stage)	STATEMENT	57
-71	71	stage/sql/closing tables	(stage)	STATEMENT	57
-72	73	stage/sql/freeing items	(stage)	STATEMENT	57
-73	73	wait/io/socket/sql/client_connection	send	STAGE	72
-74	89	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
-75	79	stage/sql/starting	(stage)	STATEMENT	74
-76	76	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	75
-77	77	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	75
-78	78	wait/io/file/sql/query_log	write	STAGE	75
-79	79	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	75
-80	80	stage/sql/checking permissions	(stage)	STATEMENT	74
-81	81	stage/sql/Opening tables	(stage)	STATEMENT	74
-82	82	stage/sql/init	(stage)	STATEMENT	74
-83	83	stage/sql/optimizing	(stage)	STATEMENT	74
-84	84	stage/sql/executing	(stage)	STATEMENT	74
-85	85	stage/sql/end	(stage)	STATEMENT	74
-86	86	stage/sql/query end	(stage)	STATEMENT	74
-87	87	stage/sql/closing tables	(stage)	STATEMENT	74
-88	89	stage/sql/freeing items	(stage)	STATEMENT	74
-89	89	wait/io/socket/sql/client_connection	send	STAGE	88
-90	106	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
-91	94	stage/sql/starting	(stage)	STATEMENT	90
-92	92	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	91
-93	93	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	91
-94	94	wait/io/file/sql/query_log	write	STAGE	91
-95	95	stage/sql/checking permissions	(stage)	STATEMENT	90
-96	96	stage/sql/Opening tables	(stage)	STATEMENT	90
-97	97	stage/sql/init	(stage)	STATEMENT	90
-98	98	stage/sql/optimizing	(stage)	STATEMENT	90
-99	99	stage/sql/executing	(stage)	STATEMENT	90
-100	100	stage/sql/end	(stage)	STATEMENT	90
-101	101	stage/sql/query end	(stage)	STATEMENT	90
-102	102	stage/sql/closing tables	(stage)	STATEMENT	90
-103	104	stage/sql/freeing items	(stage)	STATEMENT	90
-104	104	wait/io/socket/sql/client_connection	send	STAGE	103
-105	106	stage/sql/cleaning up	(stage)	STATEMENT	90
-106	106	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	105
-107	107	idle	idle	NULL	NULL
-108	125	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
-109	113	stage/sql/starting	(stage)	STATEMENT	108
-110	110	wait/io/socket/sql/client_connection	recv	STAGE	109
-111	111	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	109
-112	112	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	109
-113	113	wait/io/file/sql/query_log	write	STAGE	109
-114	114	stage/sql/checking permissions	(stage)	STATEMENT	108
-115	115	stage/sql/Opening tables	(stage)	STATEMENT	108
-116	116	stage/sql/init	(stage)	STATEMENT	108
-117	117	stage/sql/optimizing	(stage)	STATEMENT	108
-118	118	stage/sql/executing	(stage)	STATEMENT	108
-119	119	stage/sql/end	(stage)	STATEMENT	108
-120	120	stage/sql/query end	(stage)	STATEMENT	108
-121	121	stage/sql/closing tables	(stage)	STATEMENT	108
-122	123	stage/sql/freeing items	(stage)	STATEMENT	108
-123	123	wait/io/socket/sql/client_connection	send	STAGE	122
-124	125	stage/sql/cleaning up	(stage)	STATEMENT	108
-125	125	wait/synch/mutex/sql/THD::LOCK_thd_query	lock	STAGE	124
->>>>>>> merge-perfschema-5.7
diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result
index e1b00bdd0f4..9489c1049e5 100644
--- a/mysql-test/suite/perfschema/r/ortho_iter.result
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result
@@ -32,12 +32,8 @@ declare debug integer default 0;
 declare pfs_cursor CURSOR FOR
 select table_name from information_schema.tables
 where table_schema= 'performance_schema'
-<<<<<<< HEAD
-      and table_name like "events_%_by_event_name%"
+      and table_name like "%_by_event_name%"
       order by table_name;
-=======
-      and table_name like "%_by_event_name%";
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 declare continue handler for sqlstate '02000'
     set done = 1;
 select (instr_name like "wait/%") or (instr_name like "idle") into is_wait;
@@ -222,15 +218,11 @@ close pfs_cursor;
 signal sqlstate '01000' set message_text='Done', mysql_errno=12000;
 end
 $
-<<<<<<< HEAD
 Warnings:
 Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-=======
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 show global variables like "performance_schema%";
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -261,14 +253,10 @@ performance_schema_max_rwlock_classes	50
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
-<<<<<<< HEAD
-performance_schema_max_stage_classes	160
-=======
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_table_lock_stat	500
diff --git a/mysql-test/suite/perfschema/r/part_table_io.result b/mysql-test/suite/perfschema/r/part_table_io.result
index 5ef84758663..48b7c891693 100644
--- a/mysql-test/suite/perfschema/r/part_table_io.result
+++ b/mysql-test/suite/perfschema/r/part_table_io.result
@@ -13,8 +13,6 @@ insert into marker set a = 1;
 create table test.no_index_tab
 ( a varchar(255) not null, b int not null) engine = MyISAM
 PARTITION BY KEY (b) PARTITIONS 2;
-Warnings:
-Warning	1287	The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
 insert into marker set a = 1;
 show create table test.no_index_tab;
 Table	Create Table
@@ -54,18 +52,13 @@ insert into marker set a = 1;
 optimize table test.no_index_tab;
 Table	Op	Msg_type	Msg_text
 test.no_index_tab	optimize	status	OK
-test.no_index_tab	optimize	warning	The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
 insert into marker set a = 1;
 select * from test.no_index_tab;
 a	b
 bar	1
 bar	2
-Warnings:
-Warning	1287	The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
 insert into marker set a = 1;
 truncate table test.no_index_tab;
-Warnings:
-Warning	1287	The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
 insert into marker set a = 1;
 drop table test.no_index_tab;
 update performance_schema.setup_consumers set enabled='NO';
@@ -80,96 +73,50 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -178,17 +125,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
index 8407850b2b5..cbaeec201e0 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
@@ -4,97 +4,6 @@ select "not supposed to be here";
 Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 update mysql.event set db='performance_schema' where name='user_event';
-<<<<<<< HEAD
-=======
-mysql_upgrade: [ERROR] 1050: Table 'cond_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'host_cache' already exists
-mysql_upgrade: [ERROR] 1050: Table 'mutex_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'objects_summary_global_by_type' already exists
-mysql_upgrade: [ERROR] 1050: Table 'performance_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'rwlock_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_actors' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_consumers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_instruments' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_objects' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'hosts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'users' already exists
-mysql_upgrade: [ERROR] 1050: Table 'accounts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_digest' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_program' already exists
-mysql_upgrade: [ERROR] 1050: Table 'prepared_statements_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_member_stats' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_members' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_coordinator' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_worker' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_account_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_handles' already exists
-mysql_upgrade: [ERROR] 1050: Table 'metadata_locks' already exists
-mysql_upgrade: [ERROR] 1050: Table 'user_variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_user' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_host' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_account' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_status' already exists
-mysql_upgrade: [ERROR] 1644: Unexpected content found in the performance_schema database.
->>>>>>> merge-perfschema-5.7
 select name from mysql.event where db='performance_schema';
 name
 user_event
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
index 3ce580770bc..b91cb5d14a8 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
@@ -2,97 +2,6 @@
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
-<<<<<<< HEAD
-=======
-mysql_upgrade: [ERROR] 1050: Table 'cond_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'host_cache' already exists
-mysql_upgrade: [ERROR] 1050: Table 'mutex_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'objects_summary_global_by_type' already exists
-mysql_upgrade: [ERROR] 1050: Table 'performance_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'rwlock_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_actors' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_consumers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_instruments' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_objects' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'hosts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'users' already exists
-mysql_upgrade: [ERROR] 1050: Table 'accounts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_digest' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_program' already exists
-mysql_upgrade: [ERROR] 1050: Table 'prepared_statements_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_member_stats' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_members' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_coordinator' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_worker' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_account_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_handles' already exists
-mysql_upgrade: [ERROR] 1050: Table 'metadata_locks' already exists
-mysql_upgrade: [ERROR] 1050: Table 'user_variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_user' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_host' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_account' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_status' already exists
-mysql_upgrade: [ERROR] 1644: Unexpected content found in the performance_schema database.
->>>>>>> merge-perfschema-5.7
 select name from mysql.proc where db='performance_schema';
 name
 user_func
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
index 913972389ae..651bc506eee 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
@@ -2,97 +2,6 @@
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
-<<<<<<< HEAD
-=======
-mysql_upgrade: [ERROR] 1050: Table 'cond_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'host_cache' already exists
-mysql_upgrade: [ERROR] 1050: Table 'mutex_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'objects_summary_global_by_type' already exists
-mysql_upgrade: [ERROR] 1050: Table 'performance_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'rwlock_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_actors' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_consumers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_instruments' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_objects' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'hosts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'users' already exists
-mysql_upgrade: [ERROR] 1050: Table 'accounts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_digest' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_program' already exists
-mysql_upgrade: [ERROR] 1050: Table 'prepared_statements_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_member_stats' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_members' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_coordinator' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_worker' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_account_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_handles' already exists
-mysql_upgrade: [ERROR] 1050: Table 'metadata_locks' already exists
-mysql_upgrade: [ERROR] 1050: Table 'user_variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_user' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_host' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_account' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_status' already exists
-mysql_upgrade: [ERROR] 1644: Unexpected content found in the performance_schema database.
->>>>>>> merge-perfschema-5.7
 select name from mysql.proc where db='performance_schema';
 name
 user_proc
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
index 24e3f73a81a..5ff608a825f 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
@@ -4,97 +4,6 @@ use performance_schema;
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
-<<<<<<< HEAD
-=======
-mysql_upgrade: [ERROR] 1050: Table 'cond_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'host_cache' already exists
-mysql_upgrade: [ERROR] 1050: Table 'mutex_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'objects_summary_global_by_type' already exists
-mysql_upgrade: [ERROR] 1050: Table 'performance_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'rwlock_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_actors' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_consumers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_instruments' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_objects' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'hosts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'users' already exists
-mysql_upgrade: [ERROR] 1050: Table 'accounts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_digest' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_program' already exists
-mysql_upgrade: [ERROR] 1050: Table 'prepared_statements_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_member_stats' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_members' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_coordinator' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_worker' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_account_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_handles' already exists
-mysql_upgrade: [ERROR] 1050: Table 'metadata_locks' already exists
-mysql_upgrade: [ERROR] 1050: Table 'user_variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_user' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_host' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_account' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_status' already exists
-mysql_upgrade: [ERROR] 1644: Unexpected content found in the performance_schema database.
->>>>>>> merge-perfschema-5.7
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
index e36641d28ae..14a1d8deae4 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
@@ -4,97 +4,6 @@ use performance_schema;
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
-<<<<<<< HEAD
-=======
-mysql_upgrade: [ERROR] 1050: Table 'cond_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_instance' already exists
-mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'host_cache' already exists
-mysql_upgrade: [ERROR] 1050: Table 'mutex_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'objects_summary_global_by_type' already exists
-mysql_upgrade: [ERROR] 1050: Table 'performance_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'rwlock_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_actors' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_consumers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_instruments' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_objects' already exists
-mysql_upgrade: [ERROR] 1050: Table 'setup_timers' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
-mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_current' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history_long' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'hosts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'users' already exists
-mysql_upgrade: [ERROR] 1050: Table 'accounts' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_global_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_thread_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_account_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_host_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_user_by_event_name' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_digest' already exists
-mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_program' already exists
-mysql_upgrade: [ERROR] 1050: Table 'prepared_statements_instances' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_member_stats' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_group_members' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_connection_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_configuration' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_coordinator' already exists
-mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_worker' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_account_connect_attrs' already exists
-mysql_upgrade: [ERROR] 1050: Table 'table_handles' already exists
-mysql_upgrade: [ERROR] 1050: Table 'metadata_locks' already exists
-mysql_upgrade: [ERROR] 1050: Table 'user_variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'variables_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_variables' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_thread' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_user' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_host' already exists
-mysql_upgrade: [ERROR] 1050: Table 'status_by_account' already exists
-mysql_upgrade: [ERROR] 1050: Table 'global_status' already exists
-mysql_upgrade: [ERROR] 1050: Table 'session_status' already exists
-mysql_upgrade: [ERROR] 1644: Unexpected content found in the performance_schema database.
->>>>>>> merge-perfschema-5.7
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
diff --git a/mysql-test/suite/perfschema/r/prepared_statements.result b/mysql-test/suite/perfschema/r/prepared_statements.result
index 78ca2a65a1d..c11b486094e 100644
--- a/mysql-test/suite/perfschema/r/prepared_statements.result
+++ b/mysql-test/suite/perfschema/r/prepared_statements.result
@@ -57,7 +57,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st1 FROM ...
+SQL_TEXT	PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -77,12 +77,13 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st3 FROM ...
+SQL_TEXT	PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st4 FROM ...
+SQL_TEXT	PREPARE st4 FROM
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -163,7 +164,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st1 FROM ...
+SQL_TEXT	PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -183,12 +184,13 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st3 FROM ...
+SQL_TEXT	PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st4 FROM ...
+SQL_TEXT	PREPARE st4 FROM
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -295,7 +297,7 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st1 FROM ...
+SQL_TEXT	PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
@@ -315,12 +317,13 @@ OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st3 FROM ...
+SQL_TEXT	PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
 EVENT_NAME	statement/sql/prepare_sql
-SQL_TEXT	PREPARE st4 FROM ...
+SQL_TEXT	PREPARE st4 FROM
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
 OBJECT_TYPE	NULL
 OBJECT_SCHEMA	NULL
 OBJECT_NAME	NULL
diff --git a/mysql-test/suite/perfschema/r/prepared_stmts_by_stored_programs.result b/mysql-test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
index ba0652de1a3..318c4a1d21b 100644
--- a/mysql-test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
+++ b/mysql-test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
@@ -8,8 +8,6 @@ b CHAR(10),
 name CHAR(10)
 );
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 INSERT INTO t VALUES (1,"kuchipudi","Vempati");
 INSERT INTO t VALUES (2,"odissi","Mohapatra");
 INSERT INTO t VALUES (3,"kathak","Maharaj");
diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
index 4207208f42a..c5e0ebf3c92 100644
--- a/mysql-test/suite/perfschema/r/privilege.result
+++ b/mysql-test/suite/perfschema/r/privilege.result
@@ -1,7 +1,3 @@
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 show grants;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
@@ -10,14 +6,10 @@ create user 'pfs_user_1'@localhost;
 create user 'pfs_user_2'@localhost;
 create user 'pfs_user_3'@localhost;
 grant ALL on *.* to 'pfs_user_1'@localhost with GRANT OPTION;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 grant ALL on performance_schema.* to 'pfs_user_2'@localhost
 with GRANT OPTION;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant CREATE on performance_schema.* to 'pfs_user_2'@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 grant DROP on performance_schema.* to 'pfs_user_2'@localhost;
 grant REFERENCES on performance_schema.* to 'pfs_user_2'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
@@ -50,8 +42,6 @@ grant ALL on performance_schema.setup_instruments to 'pfs_user_3'@localhost
 with GRANT OPTION;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant CREATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 grant DROP on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
 grant REFERENCES on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
@@ -591,6 +581,8 @@ WHERE name LIKE 'wait/synch/mutex/%'
    OR name LIKE 'wait/synch/rwlock/%';
 UPDATE performance_schema.setup_consumers SET enabled = 'YES';
 UPDATE performance_schema.setup_timers SET timer_name = 'TICK' WHERE name <> "wait";
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 TRUNCATE TABLE performance_schema.events_waits_history_long;
 TRUNCATE TABLE performance_schema.events_waits_history;
 TRUNCATE TABLE performance_schema.events_waits_current;
@@ -603,11 +595,14 @@ flush privileges;
 UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
 UPDATE performance_schema.setup_consumers SET enabled = 'YES';
 UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle";
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="stage";
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="statement";
-set sql_mode= @orig_sql_mode;
 Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 #
 # WL#2284: Increase the length of a user name
 #
diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result
index 923ff9db1b7..77f2b4a6887 100644
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result
@@ -55,14 +55,10 @@ performance_schema_max_rwlock_classes	50
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
-<<<<<<< HEAD
-performance_schema_max_stage_classes	160
-=======
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_table_lock_stat	500
@@ -116,77 +112,38 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test", "mysql")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-=======
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	host	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	NULL
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	roles_mapping	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	procs_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	servers	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	table_stats	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	column_stats	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-<<<<<<< HEAD
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-show status like 'performance_schema_%';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	user	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	proxies_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	tables_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	procs_priv	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	servers	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	mysql	global_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	global_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	global_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	global_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	global_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	db	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	proxies_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	proxies_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	proxies_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	roles_mapping	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	tables_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	procs_priv	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	servers	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	table_stats	fetch	1
+wait/io/table/sql/handler		TABLE	mysql	column_stats	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -195,17 +152,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/query_cache.result b/mysql-test/suite/perfschema/r/query_cache.result
index 4c31d9ded5f..a84fff60431 100644
--- a/mysql-test/suite/perfschema/r/query_cache.result
+++ b/mysql-test/suite/perfschema/r/query_cache.result
@@ -3,14 +3,8 @@ drop table if exists t1;
 create table t1 (a int not null);
 insert into t1 values (1), (2), (3);
 SET GLOBAL query_cache_size=1355776;
-Warnings:
-Warning	1287	'@@query_cache_size' is deprecated and will be removed in a future release.
 flush query cache;
-Warnings:
-Warning	1681	'FLUSH QUERY CACHE' is deprecated and will be removed in a future release.
 reset query cache;
-Warnings:
-Warning	1681	'RESET QUERY CACHE' is deprecated and will be removed in a future release.
 flush status;
 select * from t1;
 a
@@ -47,7 +41,7 @@ select * from performance_schema.setup_timers where name='wait';
 NAME	TIMER_NAME
 wait	{CYCLE_OR_NANOSECOND}
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 show global status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
@@ -64,7 +58,7 @@ select * from performance_schema.setup_timers where name='wait';
 NAME	TIMER_NAME
 wait	{CYCLE_OR_NANOSECOND}
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 show global status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
diff --git a/mysql-test/suite/perfschema/r/read_only.result b/mysql-test/suite/perfschema/r/read_only.result
index b83cb907b1d..b25d542c178 100644
--- a/mysql-test/suite/perfschema/r/read_only.result
+++ b/mysql-test/suite/perfschema/r/read_only.result
@@ -1,19 +1,7 @@
 use performance_schema;
 set @start_read_only= @@global.read_only;
-<<<<<<< HEAD
 create user pfsuser@localhost;
-=======
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 grant SELECT, UPDATE on performance_schema.* to pfsuser@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 flush privileges;
 connect  con1, localhost, pfsuser, , test;
 connection default;
@@ -26,6 +14,7 @@ show grants;
 Grants for pfsuser@localhost
 GRANT USAGE ON *.* TO `pfsuser`@`localhost`
 GRANT SELECT, UPDATE ON `performance_schema`.* TO `pfsuser`@`localhost`
+# Update on perf_schema is allowed in read_only mode.
 select * from performance_schema.setup_instruments;
 update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';
@@ -59,23 +48,6 @@ update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';
 disconnect con1;
 connection default;
-set global super_read_only=1;
-connection con1;
-select @@global.super_read_only;
-@@global.super_read_only
-1
-show grants;
-Grants for pfsuser@localhost
-GRANT SUPER ON *.* TO 'pfsuser'@'localhost'
-GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
-select * from performance_schema.setup_instruments;
-# Update is allowed in super_read_only on perf schema for
-# super user.
-update performance_schema.setup_instruments set enabled='NO';
-update performance_schema.setup_instruments set enabled='YES';
-disconnect con1;
-connection default;
 set global read_only= @start_read_only;
-set global super_read_only= @start_super_read_only;
 drop user pfsuser@localhost;
 flush privileges;
diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result
index 9aafc81bac3..ce3e9c04a5e 100644
--- a/mysql-test/suite/perfschema/r/relaylog.result
+++ b/mysql-test/suite/perfschema/r/relaylog.result
@@ -50,14 +50,10 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-<<<<<<< HEAD
-wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
-wait/io/file/sql/binlog_state	NONE	NONE	NONE	NONE
-=======
 wait/io/file/sql/binlog_cache	NONE	NONE	NONE	NONE
-wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
+wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 wait/io/file/sql/binlog_index_cache	NONE	NONE	NONE	NONE
->>>>>>> merge-perfschema-5.7
+wait/io/file/sql/binlog_state	NONE	NONE	NONE	NONE
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
@@ -68,24 +64,11 @@ where event_name like "%MYSQL_BIN_LOG%"
   and event_name not like "%MYSQL_BIN_LOG::COND_xid_list"
   order by event_name;
 EVENT_NAME	COUNT_STAR
-<<<<<<< HEAD
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_bin_log_updated	MANY
-=======
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy	NONE
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_relay_log_updated	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos	MANY
-=======
-wait/synch/cond/sql/MYSQL_BIN_LOG::COND_done	NONE
-wait/synch/cond/sql/MYSQL_BIN_LOG::prep_xids_cond	NONE
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_done	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue	MANY
->>>>>>> merge-perfschema-5.7
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list	MANY
 "Expect no slave relay log"
@@ -156,14 +139,10 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-<<<<<<< HEAD
-wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
-wait/io/file/sql/binlog_state	NONE	NONE	NONE	NONE
-=======
 wait/io/file/sql/binlog_cache	NONE	NONE	NONE	NONE
-wait/io/file/sql/binlog_index	MANY	NONE	MANY	NONE
+wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 wait/io/file/sql/binlog_index_cache	NONE	NONE	NONE	NONE
->>>>>>> merge-perfschema-5.7
+wait/io/file/sql/binlog_state	NONE	NONE	NONE	NONE
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
@@ -174,24 +153,11 @@ where event_name like "%MYSQL_BIN_LOG%"
   and event_name not like "%MYSQL_BIN_LOG::COND_xid_list"
   order by event_name;
 EVENT_NAME	COUNT_STAR
-<<<<<<< HEAD
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_bin_log_updated	NONE
-=======
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_queue_busy	NONE
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_relay_log_updated	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_background_thread	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos	MANY
-=======
-wait/synch/cond/sql/MYSQL_BIN_LOG::COND_done	NONE
-wait/synch/cond/sql/MYSQL_BIN_LOG::prep_xids_cond	NONE
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_done	MANY
-wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue	MANY
->>>>>>> merge-perfschema-5.7
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_xid_list	MANY
 "Expect a slave relay log"
@@ -222,13 +188,9 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%relaylog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
-<<<<<<< HEAD
-wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
-=======
 wait/io/file/sql/relaylog_cache	NONE	NONE	NONE	NONE
-wait/io/file/sql/relaylog_index	MANY	NONE	NONE	NONE
+wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
 wait/io/file/sql/relaylog_index_cache	NONE	NONE	NONE	NONE
->>>>>>> merge-perfschema-5.7
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
diff --git a/mysql-test/suite/perfschema/r/rollback_table_io.result b/mysql-test/suite/perfschema/r/rollback_table_io.result
index a874cba14a5..a7946da7eab 100644
--- a/mysql-test/suite/perfschema/r/rollback_table_io.result
+++ b/mysql-test/suite/perfschema/r/rollback_table_io.result
@@ -42,48 +42,30 @@ where event_name like 'wait/io/table/%'
   and object_schema in ('test')
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -92,17 +74,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result
index cbe2a7c2246..de4b1ea18ca 100644
--- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result
+++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result
@@ -45,23 +45,15 @@ TABLE	information_schema	%	NO	NO
 TABLE	master	foo	YES	YES
 TABLE	mysql	%	NO	NO
 TABLE	performance_schema	%	NO	NO
-<<<<<<< HEAD
-select digest_text, count_star
-from performance_schema.events_statements_summary_by_digest
-where digest_text like "%in_%_digest%";
-digest_text	count_star
-SELECT ? AS `in_master_digest` 	1
-=======
 TRIGGER	%	%	YES	YES
 TRIGGER	information_schema	%	NO	NO
 TRIGGER	mysql	%	NO	NO
 TRIGGER	performance_schema	%	NO	NO
-select digest, digest_text, count_star
+select digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
-digest	digest_text	count_star
-dc3177eb15d923e08c09eef29cecd9a4	SELECT ? AS `in_master_digest` 	1
->>>>>>> merge-perfschema-5.7
+digest_text	count_star
+SELECT ? AS `in_master_digest` 	1
 insert into test.marker values (2);
 connection slave;
 select * from test.marker;
@@ -96,25 +88,16 @@ TABLE	information_schema	%	NO	NO
 TABLE	mysql	%	NO	NO
 TABLE	performance_schema	%	NO	NO
 TABLE	slave	foo	YES	YES
-<<<<<<< HEAD
-select digest_text, count_star
-from performance_schema.events_statements_summary_by_digest
-where digest_text like "%in_%_digest%";
-digest_text	count_star
-SELECT ? AS `in_slave_digest` 	1
-connection master;
-=======
 TRIGGER	%	%	YES	YES
 TRIGGER	information_schema	%	NO	NO
 TRIGGER	mysql	%	NO	NO
 TRIGGER	performance_schema	%	NO	NO
-select digest, digest_text, count_star
+select digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
-digest	digest_text	count_star
-01f5f7c4c65eb61bb9a6afb7172c4a54	SELECT ? AS `in_slave_digest` 	1
-**** On Master ****
->>>>>>> merge-perfschema-5.7
+digest_text	count_star
+SELECT ? AS `in_slave_digest` 	1
+connection master;
 delete from performance_schema.setup_objects
 where object_schema='master';
 connection slave;
diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result
index c2b9ad7d514..d72402bf691 100644
--- a/mysql-test/suite/perfschema/r/rpl_statements.result
+++ b/mysql-test/suite/perfschema/r/rpl_statements.result
@@ -8,11 +8,7 @@ connection master;
 
 *** Create test tables
 
-<<<<<<< HEAD
-show variables like 'binlog_format%';
-=======
-show global variables like '%binlog_format%';
->>>>>>> merge-perfschema-5.7
+show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
 drop table if exists test.marker;
@@ -48,11 +44,7 @@ Expect 1
 #
 connection master;
 
-<<<<<<< HEAD
-show variables like 'binlog_format%';
-=======
-show global variables like '%binlog_format%';
->>>>>>> merge-perfschema-5.7
+show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
 *** Clear statement events
diff --git a/mysql-test/suite/perfschema/r/rpl_threads.result b/mysql-test/suite/perfschema/r/rpl_threads.result
index c5f22449ec7..c756b4d9046 100644
--- a/mysql-test/suite/perfschema/r/rpl_threads.result
+++ b/mysql-test/suite/perfschema/r/rpl_threads.result
@@ -1,20 +1,23 @@
 include/master-slave.inc
-Warnings:
-Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
 [connection master]
 drop table if exists test.t1;
+connection slave;
 reset master;
 create table test.t1(a int);
 drop table test.t1;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; create table test.t1(a int)
+slave-bin.000001	#	Gtid	#	#	GTID #-#-#
 slave-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+connection master;
 "============ Performance schema on master ============"
 select ID from INFORMATION_SCHEMA.PROCESSLIST
 where COMMAND = "Binlog Dump"
   into @master_dump_pid;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 select COMMAND, STATE
 from INFORMATION_SCHEMA.PROCESSLIST
 where ID = @master_dump_pid;
@@ -25,31 +28,34 @@ from performance_schema.threads
 where PROCESSLIST_ID = @master_dump_pid;
 NAME	TYPE	PROCESSLIST_COMMAND	PROCESSLIST_STATE
 thread/sql/one_connection	FOREGROUND	Binlog Dump	Master has sent all binlog to slave; waiting for more updates
+connection slave;
 "============ Performance schema on slave ============"
 select ID from INFORMATION_SCHEMA.PROCESSLIST
 where STATE like "Waiting for master to send event%"
   into @slave_io_pid;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 select COMMAND, STATE
 from INFORMATION_SCHEMA.PROCESSLIST
 where ID = @slave_io_pid;
 COMMAND	STATE
-Connect	Waiting for master to send event
+Slave_IO	Waiting for master to send event
 select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
 from performance_schema.threads
 where PROCESSLIST_ID = @slave_io_pid;
 NAME	TYPE	PROCESSLIST_COMMAND	PROCESSLIST_STATE
-thread/sql/slave_io	FOREGROUND	Connect	Waiting for master to send event
 select ID from INFORMATION_SCHEMA.PROCESSLIST
 where STATE like "Slave has read all relay log%"
   into @slave_sql_pid;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 select COMMAND, STATE
 from INFORMATION_SCHEMA.PROCESSLIST
 where ID = @slave_sql_pid;
 COMMAND	STATE
-Connect	Slave has read all relay log; waiting for more updates
+Slave_SQL	Slave has read all relay log; waiting for more updates
 select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
 from performance_schema.threads
 where PROCESSLIST_ID = @slave_sql_pid;
 NAME	TYPE	PROCESSLIST_COMMAND	PROCESSLIST_STATE
-thread/sql/slave_sql	FOREGROUND	Connect	Slave has read all relay log; waiting for more updates
 include/rpl_end.inc
diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result
index 800cc59414e..f92548d5876 100644
--- a/mysql-test/suite/perfschema/r/schema.result
+++ b/mysql-test/suite/perfschema/r/schema.result
@@ -48,7 +48,6 @@ file_instances
 file_summary_by_event_name
 file_summary_by_instance
 global_status
-global_variables
 host_cache
 hosts
 memory_summary_by_account_by_event_name
@@ -64,16 +63,11 @@ prepared_statements_instances
 replication_applier_configuration
 replication_applier_status
 replication_applier_status_by_coordinator
-replication_applier_status_by_worker
 replication_connection_configuration
-replication_connection_status
-replication_group_member_stats
-replication_group_members
 rwlock_instances
 session_account_connect_attrs
 session_connect_attrs
 session_status
-session_variables
 setup_actors
 setup_consumers
 setup_instruments
@@ -93,11 +87,10 @@ table_lock_waits_summary_by_table
 threads
 user_variables_by_thread
 users
-variables_by_thread
 show create table accounts;
 Table	Create Table
 accounts	CREATE TABLE `accounts` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
   `TOTAL_CONNECTIONS` bigint(20) NOT NULL
@@ -181,7 +174,7 @@ events_stages_summary_by_thread_by_event_name	CREATE TABLE `events_stages_summar
 show create table events_stages_summary_by_user_by_event_name;
 Table	Create Table
 events_stages_summary_by_user_by_event_name	CREATE TABLE `events_stages_summary_by_user_by_event_name` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
   `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -192,7 +185,7 @@ events_stages_summary_by_user_by_event_name	CREATE TABLE `events_stages_summary_
 show create table events_stages_summary_by_account_by_event_name;
 Table	Create Table
 events_stages_summary_by_account_by_event_name	CREATE TABLE `events_stages_summary_by_account_by_event_name` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
@@ -442,7 +435,7 @@ events_statements_summary_by_thread_by_event_name	CREATE TABLE `events_statement
 show create table events_statements_summary_by_user_by_event_name;
 Table	Create Table
 events_statements_summary_by_user_by_event_name	CREATE TABLE `events_statements_summary_by_user_by_event_name` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
   `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -472,7 +465,7 @@ events_statements_summary_by_user_by_event_name	CREATE TABLE `events_statements_
 show create table events_statements_summary_by_account_by_event_name;
 Table	Create Table
 events_statements_summary_by_account_by_event_name	CREATE TABLE `events_statements_summary_by_account_by_event_name` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
@@ -823,7 +816,7 @@ events_waits_summary_by_thread_by_event_name	CREATE TABLE `events_waits_summary_
 show create table events_waits_summary_by_user_by_event_name;
 Table	Create Table
 events_waits_summary_by_user_by_event_name	CREATE TABLE `events_waits_summary_by_user_by_event_name` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
   `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -834,7 +827,7 @@ events_waits_summary_by_user_by_event_name	CREATE TABLE `events_waits_summary_by
 show create table events_waits_summary_by_account_by_event_name;
 Table	Create Table
 events_waits_summary_by_account_by_event_name	CREATE TABLE `events_waits_summary_by_account_by_event_name` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
@@ -1089,7 +1082,7 @@ show create table setup_actors;
 Table	Create Table
 setup_actors	CREATE TABLE `setup_actors` (
   `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
   `ROLE` char(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
   `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES',
   `HISTORY` enum('YES','NO') NOT NULL DEFAULT 'YES'
@@ -1341,6 +1334,11 @@ table_lock_waits_summary_by_table	CREATE TABLE `table_lock_waits_summary_by_tabl
   `MIN_TIMER_WRITE_CONCURRENT_INSERT` bigint(20) unsigned NOT NULL,
   `AVG_TIMER_WRITE_CONCURRENT_INSERT` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_WRITE_CONCURRENT_INSERT` bigint(20) unsigned NOT NULL,
+  `COUNT_WRITE_DELAYED` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WRITE_DELAYED` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WRITE_DELAYED` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WRITE_DELAYED` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WRITE_DELAYED` bigint(20) unsigned NOT NULL,
   `COUNT_WRITE_LOW_PRIORITY` bigint(20) unsigned NOT NULL,
   `SUM_TIMER_WRITE_LOW_PRIORITY` bigint(20) unsigned NOT NULL,
   `MIN_TIMER_WRITE_LOW_PRIORITY` bigint(20) unsigned NOT NULL,
@@ -1364,7 +1362,7 @@ threads	CREATE TABLE `threads` (
   `NAME` varchar(128) NOT NULL,
   `TYPE` varchar(10) NOT NULL,
   `PROCESSLIST_ID` bigint(20) unsigned DEFAULT NULL,
-  `PROCESSLIST_USER` varchar(32) DEFAULT NULL,
+  `PROCESSLIST_USER` varchar(128) DEFAULT NULL,
   `PROCESSLIST_HOST` varchar(60) DEFAULT NULL,
   `PROCESSLIST_DB` varchar(64) DEFAULT NULL,
   `PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL,
@@ -1381,7 +1379,7 @@ threads	CREATE TABLE `threads` (
 show create table users;
 Table	Create Table
 users	CREATE TABLE `users` (
-  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
   `TOTAL_CONNECTIONS` bigint(20) NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/perfschema/r/setup_actors.result b/mysql-test/suite/perfschema/r/setup_actors.result
index 554df495c4e..b6d528173bf 100644
--- a/mysql-test/suite/perfschema/r/setup_actors.result
+++ b/mysql-test/suite/perfschema/r/setup_actors.result
@@ -12,50 +12,21 @@ insert into performance_schema.setup_actors
 values ('hostb', '%', '%', 'YES', 'YES');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-<<<<<<< HEAD
-HOST	USER	ROLE
-hostb	%	%
-hosta	user1	%
-%	user2	%
-localhost	user3	%
-create user user1@localhost;
-grant ALL on *.* to user1@localhost;
-create user user2@localhost;
-grant ALL on *.* to user2@localhost;
-create user user3@localhost;
-grant ALL on *.* to user3@localhost;
-create user user4@localhost;
-grant ALL on *.* to user4@localhost;
-create user user5@localhost;
-=======
 HOST	USER	ROLE	ENABLED	HISTORY
 hostb	%	%	YES	YES
 hosta	user1	%	YES	YES
 %	user2	%	YES	YES
 localhost	user3	%	YES	YES
-set @orig_sql_mode= @@sql_mode;
-set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
+create user user1@localhost;
 grant ALL on *.* to user1@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+create user user2@localhost;
 grant ALL on *.* to user2@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+create user user3@localhost;
 grant ALL on *.* to user3@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+create user user4@localhost;
 grant ALL on *.* to user4@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
->>>>>>> merge-perfschema-5.7
+create user user5@localhost;
 grant select on test.* to user5@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 flush privileges;
 connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
@@ -65,13 +36,8 @@ NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user1	localhost
 connection default;
 insert into performance_schema.setup_actors
-<<<<<<< HEAD
-values ('%', 'user1', '%');
-connection con1;
-=======
 values ('%', 'user1', '%', 'YES', 'YES');
-# Switch to connection con1
->>>>>>> merge-perfschema-5.7
+connection con1;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -127,16 +93,6 @@ insert into performance_schema.setup_actors
 values ('localhost', '%', '%', 'YES', 'YES');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-<<<<<<< HEAD
-HOST	USER	ROLE
-hostb	%	%
-localhost	%	%
-%	user1	%
-hosta	user1	%
-%	user2	%
-localhost	user3	%
-connect  con4b, localhost, user4, , ;
-=======
 HOST	USER	ROLE	ENABLED	HISTORY
 hostb	%	%	YES	YES
 localhost	%	%	YES	YES
@@ -144,8 +100,7 @@ localhost	%	%	YES	YES
 hosta	user1	%	YES	YES
 %	user2	%	YES	YES
 localhost	user3	%	YES	YES
-# Switch to (con4b, localhost, user4, , )
->>>>>>> merge-perfschema-5.7
+connect  con4b, localhost, user4, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
diff --git a/mysql-test/suite/perfschema/r/setup_actors_enabled.result b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
index 398af1e8446..c0dda748f28 100644
--- a/mysql-test/suite/perfschema/r/setup_actors_enabled.result
+++ b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
@@ -8,66 +8,73 @@ insert into performance_schema.setup_actors
 values ('localhost', 'user2', '%', 'NO', 'NO');
 set @orig_sql_mode= @@sql_mode;
 set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 grant ALL on *.* to user1@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 grant ALL on *.* to user2@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 flush privileges;
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	user1	localhost
 # Switch to (con2, localhost, user2, , )
+connect  con2, localhost, user2, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user2	localhost
 # Switch to connection default
+connection default;
 update performance_schema.setup_actors set ENABLED='NO' where USER='user1';
 update performance_schema.setup_actors set ENABLED='YES' where USER='user2';
 # Switch to connection con1
+connection con1;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	user1	localhost
 # Switch to connection con2
+connection con2;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user2	localhost
 # Disconnect con1 and con2
+disconnect con1;
+disconnect con2;
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user1	localhost
 # Switch to (con2 localhost, user2, , )
+connect  con2, localhost, user2, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	user2	localhost
 # Disconnect con1 and con2
+disconnect con1;
+disconnect con2;
 # Switch to connection default
+connection default;
 revoke update on *.* from 'user2'@'localhost';
 flush privileges;
 # Switch to (con2 localhost, user2, , )
+connect  con2, localhost, user2, , ;
 update performance_schema.setup_actors 
 set ENABLED='NO';
 ERROR 42000: UPDATE command denied to user 'user2'@'localhost' for table 'setup_actors'
+disconnect con2;
+connection default;
 insert into performance_schema.setup_actors
 values ('%', 'user1', '%', 'YES', 'YES');
 insert into performance_schema.setup_actors
@@ -75,35 +82,47 @@ values ('localhost', '%', '%', 'NO', 'NO');
 insert into performance_schema.setup_actors
 values ('%', '%', '%', 'YES', 'YES');
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user1	localhost
+disconnect con1;
+connection default;
 delete from performance_schema.setup_actors where
 HOST='localhost' and USER='user1';
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	user1	localhost
+disconnect con1;
+connection default;
 delete from performance_schema.setup_actors where
 HOST='%' and USER='user1';
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user1	localhost
+disconnect con1;
+connection default;
 delete from performance_schema.setup_actors where
 HOST='localhost' and USER='%';
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	user1	localhost
+disconnect con1;
+connection default;
 revoke all privileges, grant option from user1@localhost;
 revoke all privileges, grant option from user2@localhost;
 drop user user1@localhost;
diff --git a/mysql-test/suite/perfschema/r/setup_actors_history.result b/mysql-test/suite/perfschema/r/setup_actors_history.result
index 7741e80db8e..cbf531911f8 100644
--- a/mysql-test/suite/perfschema/r/setup_actors_history.result
+++ b/mysql-test/suite/perfschema/r/setup_actors_history.result
@@ -20,85 +20,107 @@ grant ALL on *.* to user3@localhost;
 grant ALL on *.* to user4@localhost;
 flush privileges;
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	YES	user1	localhost
 # Switch to (con2, localhost, user2, , )
+connect  con2, localhost, user2, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	NO	user2	localhost
 # Switch to (con3, localhost, user3, , )
+connect  con3, localhost, user3, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	YES	user3	localhost
 # Switch to (con4, localhost, user4, , )
+connect  con4, localhost, user4, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	NO	user4	localhost
 # Switch to connection default
+connection default;
 update performance_schema.setup_actors
 set HISTORY='NO' where USER in ('user1', 'user3');
 update performance_schema.setup_actors
 set HISTORY='YES' where USER in ('user2', 'user4');
 # Switch to connection con1
+connection con1;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	YES	user1	localhost
 # Switch to connection con2
+connection con2;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	NO	user2	localhost
 # Switch to connection con3
+connection con3;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	YES	user3	localhost
 # Switch to connection con4
+connection con4;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	NO	user4	localhost
 # Disconnect all con
+disconnect con1;
+disconnect con2;
+disconnect con3;
+disconnect con4;
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	NO	user1	localhost
 # Switch to (con2 localhost, user2, , )
+connect  con2, localhost, user2, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	YES	user2	localhost
 # Switch to (con3, localhost, user3, , )
+connect  con3, localhost, user3, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	NO	user3	localhost
 # Switch to (con4 localhost, user4, , )
+connect  con4, localhost, user4, , ;
 select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 NAME	TYPE	INSTRUMENTED	HISTORY	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	YES	user4	localhost
 # Disconnect all con
+disconnect con1;
+disconnect con2;
+disconnect con3;
+disconnect con4;
 # Switch to connection default
+connection default;
 revoke all privileges, grant option from user1@localhost;
 revoke all privileges, grant option from user2@localhost;
 revoke all privileges, grant option from user3@localhost;
diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
index 287dbe23956..4c638197235 100644
--- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
+++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
@@ -5,28 +5,14 @@ SELECT * FROM performance_schema.setup_instruments
 WHERE name IN (
 'wait/synch/mutex/sql/LOCK_user_conn',
 'wait/synch/mutex/sql/LOCK_uuid_generator',
-<<<<<<< HEAD
 'wait/synch/mutex/sql/LOCK_plugin',
-=======
-'wait/synch/mutex/sql/LOCK_transaction_cache',
->>>>>>> merge-perfschema-5.7
 'stage/sql/creating table')
 AND enabled = 'yes' AND timed = 'no'
 ORDER BY name;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
-stage/sql/Creating table	YES	NO
-=======
 stage/sql/creating table	YES	NO
-<<<<<<< HEAD
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 wait/synch/mutex/sql/LOCK_plugin	YES	NO
 wait/synch/mutex/sql/LOCK_user_conn	YES	NO
-=======
-wait/synch/mutex/sql/LOCK_transaction_cache	YES	NO
-wait/synch/mutex/sql/LOCK_user_conn	YES	NO
-wait/synch/mutex/sql/LOCK_uuid_generator	YES	NO
->>>>>>> merge-perfschema-5.7
 SELECT * FROM performance_schema.setup_instruments
 WHERE name = 'wait/synch/mutex/sql/LOCK_thd_list'
 AND enabled = 'no' AND timed = 'no';
@@ -38,10 +24,6 @@ WHERE name IN (
 AND enabled = 'yes' AND timed = 'yes'
 ORDER BY name;
 NAME	ENABLED	TIMED
-<<<<<<< HEAD
-wait/synch/mutex/sql/THD::LOCK_thd_data	YES	YES
-=======
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 SELECT * FROM performance_schema.setup_instruments
 WHERE name = 'wait/synch/mutex/sql/hash_filo::lock'
 AND enabled = 'no' AND timed = 'no'
diff --git a/mysql-test/suite/perfschema/r/setup_object_table_lock_io.result b/mysql-test/suite/perfschema/r/setup_object_table_lock_io.result
index 729b37632f3..97fda63d7ee 100644
--- a/mysql-test/suite/perfschema/r/setup_object_table_lock_io.result
+++ b/mysql-test/suite/perfschema/r/setup_object_table_lock_io.result
@@ -32,8 +32,8 @@ select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
 OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
-db1	t1	3	0	3
-db1	t2	3	0	3
+db1	t1	6	0	6
+db1	t2	6	0	6
 select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_io_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
@@ -46,8 +46,8 @@ select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
 OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
-db1	t1	4	0	4
-db1	t2	4	0	4
+db1	t1	6	0	6
+db1	t2	6	0	6
 select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_io_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
@@ -60,7 +60,7 @@ select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
 OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
-db1	t2	4	0	4
+db1	t2	6	0	6
 select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_io_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
@@ -72,8 +72,8 @@ select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
 OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
-db1	t1	1	0	1
-db1	t2	4	0	4
+db1	t1	0	0	0
+db1	t2	6	0	6
 select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
 from performance_schema.table_io_waits_summary_by_table
 where OBJECT_SCHEMA='db1';
diff --git a/mysql-test/suite/perfschema/r/setup_objects.result b/mysql-test/suite/perfschema/r/setup_objects.result
index 0f363015623..ec9a0089b8d 100644
--- a/mysql-test/suite/perfschema/r/setup_objects.result
+++ b/mysql-test/suite/perfschema/r/setup_objects.result
@@ -25,13 +25,7 @@ insert into performance_schema.setup_objects
 values ('TABLE', 'db4', 't1', 'NO', 'YES');
 insert into performance_schema.setup_objects
 values ('TABLE', 'db4', '%', 'YES', 'NO');
-<<<<<<< HEAD
-set sql_mode= '';
-=======
 SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 insert into performance_schema.setup_objects
 values ('SOMETHING', 'bad1', 'bad1', 'YES', 'NO');
 ERROR 23000: Cannot add or update a child row: a foreign key constraint fails
@@ -88,11 +82,7 @@ TABLE	db3	t1	YES	YES
 TABLE	db3	t2	NO	NO
 TABLE	db4	%	YES	NO
 TABLE	db4	t1	NO	YES
-<<<<<<< HEAD
-set sql_mode= DEFAULT;
-=======
 SET sql_mode = default;
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 drop database if exists db1;
 drop database if exists db2;
 drop database if exists db3;
diff --git a/mysql-test/suite/perfschema/r/short_option_1.result b/mysql-test/suite/perfschema/r/short_option_1.result
index 3eff8f4d8f9..ab3a13b8eed 100644
--- a/mysql-test/suite/perfschema/r/short_option_1.result
+++ b/mysql-test/suite/perfschema/r/short_option_1.result
@@ -3,32 +3,21 @@ result
 Ok, the server started
 select @@SQL_MODE;
 @@SQL_MODE
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,ANSI
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
 show global variables like 'sql_mode';
 Variable_name	Value
-sql_mode	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,ANSI
+sql_mode	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
 select @@character_set_server;
 @@character_set_server
 utf8
 show global variables like 'character_set_system';
 Variable_name	Value
 character_set_system	utf8
-<<<<<<< HEAD
-show variables like 'general_log';
-=======
-show global variables like 'log';
-Variable_name	Value
 show global variables like 'general_log';
->>>>>>> merge-perfschema-5.7
 Variable_name	Value
 general_log	ON
 show global variables like 'new';
 Variable_name	Value
-<<<<<<< HEAD
-show variables like 'log_warnings';
-=======
-new	ON
 show global variables like 'log_warnings';
->>>>>>> merge-perfschema-5.7
 Variable_name	Value
 log_warnings	2
diff --git a/mysql-test/suite/perfschema/r/short_option_2.result b/mysql-test/suite/perfschema/r/short_option_2.result
index 36d353481b7..6b5b06cb4a1 100644
--- a/mysql-test/suite/perfschema/r/short_option_2.result
+++ b/mysql-test/suite/perfschema/r/short_option_2.result
@@ -3,9 +3,7 @@ result
 Ok, the server started
 select @@SQL_MODE;
 @@SQL_MODE
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,ANSI
+REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
 select @@log_warnings;
 @@log_warnings
 2
-Warnings:
-Warning	1287	'@@log_warnings' is deprecated and will be removed in a future release. Please use log_error_verbosity instead
diff --git a/mysql-test/suite/perfschema/r/show_aggregate.result b/mysql-test/suite/perfschema/r/show_aggregate.result
index 20cee6f6013..7b9e3889bc6 100644
--- a/mysql-test/suite/perfschema/r/show_aggregate.result
+++ b/mysql-test/suite/perfschema/r/show_aggregate.result
@@ -2,9 +2,6 @@
 ================================================================================
 SETUP
 ================================================================================
-# Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
-SET @@global.show_compatibility_56=OFF;
 SET @@session.sql_log_bin=OFF;
 
 # CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE
@@ -30,20 +27,10 @@ CREATE TABLE t3 (s1 int) ENGINE=InnoDB;
 
 set @orig_sql_mode= @@sql_mode;
 set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 GRANT ALL ON *.* to 'user1'@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 GRANT ALL ON *.* to 'user2'@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 GRANT ALL ON *.* to 'user3'@localhost;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 set sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 
 ================================================================================
 CONNECTION 1: DELETE 1, ROLLBACK x 1
@@ -515,7 +502,7 @@ TEST 8: FLUSH STATUS should clear account, host and user status
 
 FLUSH STATUS;
 
-SELECT * FROM status_by_account WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+SELECT * FROM status_by_account WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
 USER	HOST	VARIABLE_NAME	VARIABLE_VALUE
 user1	localhost	Handler_delete	0
 user2	localhost	Handler_delete	0
@@ -525,7 +512,7 @@ SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('
 HOST	VARIABLE_NAME	VARIABLE_VALUE
 localhost	Handler_delete	0
 
-SELECT * FROM status_by_user WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+SELECT * FROM status_by_user WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
 USER	VARIABLE_NAME	VARIABLE_VALUE
 user1	Handler_delete	0
 user2	Handler_delete	0
@@ -541,5 +528,3 @@ DROP USER 'user1'@localhost;
 DROP USER 'user2'@localhost;
 DROP USER 'user3'@localhost;
 
-# Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/r/show_coverage.result b/mysql-test/suite/perfschema/r/show_coverage.result
index 532aeff5af1..933554d81a3 100644
--- a/mysql-test/suite/perfschema/r/show_coverage.result
+++ b/mysql-test/suite/perfschema/r/show_coverage.result
@@ -1,9 +1,3 @@
-select @@global.show_compatibility_56 into @show_compatibility_56_save;
-
-================================================================================
-SHOW_COMPATIBILITY_56 = ON
-================================================================================
-set global show_compatibility_56 = ON;
 
 # TEST 1
 # Handling of SHOW STATUS/VARIABLES ... WHERE
@@ -31,15 +25,8 @@ Variable_name	Value
 #
 USE test;
 CREATE TABLE t0 SELECT * FROM information_schema.global_status WHERE variable_name = 'COM_SELECT';
-Warnings:
-Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
 DROP TABLE t0;
 
-================================================================================
-SHOW_COMPATIBILITY_56 = OFF
-================================================================================
-set global show_compatibility_56 = OFF;
-
 # TEST 3
 # Select status and system variable tables using ORDER BY to exercise the
 # rnd_pos() method
@@ -81,6 +68,7 @@ Variable_name	Value
 #
 
 # Create a new connection
+connect con1, localhost, root,,;
 
 # Record thread id
 
@@ -88,11 +76,15 @@ Variable_name	Value
 USE test;
 SHOW TABLES;
 Tables_in_test
+connection default;
 USE performance_schema;
 
 # Record bytes_received for other connection
 SELECT variable_value FROM status_by_thread
 WHERE variable_name = "bytes_received" and thread_id = @thread_id INTO @bytes_before;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+Warning	1329	No data - zero rows fetched, selected, or processed
 
 # Reset status counters
 FLUSH STATUS;
@@ -100,16 +92,20 @@ FLUSH STATUS;
 # Record bytes_received after reset
 SELECT variable_value FROM status_by_thread
 WHERE variable_name = "bytes_received" and thread_id = @thread_id INTO @bytes_after;
+Warnings:
+Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+Warning	1329	No data - zero rows fetched, selected, or processed
 
 # Expect bytes_before > bytes_after
 SELECT @bytes_before > @bytes_after AS 'Expect 1';
 Expect 1
-1
+NULL
 
 # Expect bytes_after is zero
 SELECT @bytes_after AS 'Expect 0';
 Expect 0
-0
+NULL
+disconnect con1;
 
 # TEST 6
 #
@@ -119,6 +115,7 @@ Expect 0
 # Default connection
 
 # First connection
+connect  con1, localhost, root,,;
 include/assert.inc [Global value requested from the first session must not change]
 
 # Generate a slow query
@@ -131,8 +128,11 @@ SET long_query_time = @@global.long_query_time;
 
 include/assert.inc [Global value requested from the first session after SLEEP() must increase by 1]
 include/assert.inc [First session value must increase by 1]
+connection default;
+disconnect con1;
 
 # Default connection
+connection default;
 include/assert.inc [Global value requested from the default session after DISCONNECT must remain the same]
 include/assert.inc [Default session value must remain zero]
 
@@ -140,5 +140,3 @@ FLUSH STATUS;
 
 include/assert.inc [Global value requested from the default session after FLUSH must remain the same]
 include/assert.inc [Default session value after FLUSH must remain zero]
-# CLEANUP
-set @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/r/show_misc.result b/mysql-test/suite/perfschema/r/show_misc.result
index 3612139c68a..6b5baaaf498 100644
--- a/mysql-test/suite/perfschema/r/show_misc.result
+++ b/mysql-test/suite/perfschema/r/show_misc.result
@@ -1,50 +1,15 @@
-select @@global.show_compatibility_56 into @show_compatibility_56_save;
-================================================================================
-SHOW_COMPATIBILITY_56 = ON
-================================================================================
-set global show_compatibility_56 = on;
-select 1;
-1
-1
-SHOW STATUS LIKE 'Last_query_partial_plans';
-Variable_name	Value
-Last_query_partial_plans	0
-select 2;
-2
-2
-SHOW STATUS LIKE 'Last_query_cost';
-Variable_name	Value
-Last_query_cost	0.000000
-
-================================================================================
-SHOW_COMPATIBILITY_56 = OFF
-================================================================================
-set global show_compatibility_56 = off;
 select 1;
 1
 1
 SHOW STATUS LIKE 'Last_query_partial_plans';
 Variable_name	Value
-Last_query_partial_plans	0
 select 2;
 2
 2
 SHOW STATUS LIKE 'Last_query_cost';
 Variable_name	Value
 Last_query_cost	0.000000
-================================================================================
-SHOW_COMPATIBILITY_56 = ON
-================================================================================
 flush status;
-set global show_compatibility_56 = on;
-SHOW STATUS LIKE 'Created_tmp_tables';
-Variable_name	Value
-Created_tmp_tables	0
-
-================================================================================
-SHOW_COMPATIBILITY_56 = OFF
-================================================================================
-set global show_compatibility_56 = off;
 SHOW STATUS LIKE 'Created_tmp_tables';
 Variable_name	Value
 Created_tmp_tables	0
@@ -107,4 +72,3 @@ wait_timeout
 ================================================================================
 CLEAN UP
 ================================================================================
-set @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/r/show_plugin.result b/mysql-test/suite/perfschema/r/show_plugin.result
index 83e1d664f1a..172cea22574 100644
--- a/mysql-test/suite/perfschema/r/show_plugin.result
+++ b/mysql-test/suite/perfschema/r/show_plugin.result
@@ -4,19 +4,12 @@ SETUP
 ================================================================================
 # Save the initial number of concurrent sessions
 
-# Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
-#
-# SET COMPATIBILITY MODE = OFF
-#
-SET @@global.show_compatibility_56 = OFF;
-
 # Verify EXAMPLE plugin is not loaded
 SELECT COUNT(*) = 0 AS "Expect 1" FROM information_schema.plugins WHERE plugin_name = "EXAMPLE";
 Expect 1
 1
 
-# Create one session to force local and global system variables;
+# Create one session to force local and global system variables
 connect con0, localhost, root,,;
 connection default;
 
@@ -54,7 +47,7 @@ TEST 2 - PLUGIN LOAD, UNLOAD, RELOAD
 ================================================================================
 2.1 - INSTALL PLUGIN
 ================================================================================
-INSTALL PLUGIN example SONAME 'ha_example.so';
+INSTALL PLUGIN example SONAME 'ha_example';
 
 ================================================================================
 2.1a - FORCE SYNC OF LOCAL AND GLOBAL SYSTEM VARS
@@ -62,71 +55,47 @@ INSTALL PLUGIN example SONAME 'ha_example.so';
 
 SHOW GLOBAL STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 8, int_var is 0, double_var is 8.500000, really
 
 SHOW SESSION STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 8, int_var is 0, double_var is 8.500000, really
 
 SHOW GLOBAL VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	8.500000
 example_double_var	8.500000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	8
+example_varopt_default	5
 
 SHOW SESSION VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	8.500000
 example_double_var	8.500000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	8
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
 example_double_thdvar	8.500000
 example_double_var	8.500000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	8
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_double_thdvar	8.500000
-example_double_var	8.500000
-example_enum_var	e1
-example_ulong_var	8
 disconnect con0;
 
 ================================================================================
@@ -146,71 +115,47 @@ SET SESSION example_double_thdvar = 102.9992;
 
 SHOW GLOBAL STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 100, int_var is 0, double_var is 100.999000, really
 
 SHOW SESSION STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 100, int_var is 0, double_var is 100.999000, really
 
 SHOW GLOBAL VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	101.999100
 example_double_var	100.999000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	100
+example_varopt_default	5
 
 SHOW SESSION VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	102.999200
 example_double_var	100.999000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	100
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
 example_double_thdvar	101.999100
 example_double_var	100.999000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	100
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_double_thdvar	102.999200
-example_double_var	100.999000
-example_enum_var	e1
-example_ulong_var	100
 
 ================================================================================
 2.4 - UNINSTALL PLUGIN
@@ -249,7 +194,7 @@ variable_name	variable_value
 2.6 - REINSTALL PLUGIN
 ================================================================================
 # Reinstall EXAMPLE plugin
-INSTALL PLUGIN example SONAME 'ha_example.so';
+INSTALL PLUGIN example SONAME 'ha_example';
 
 ================================================================================
 2.7 - SET PLUGIN VARS AGAIN
@@ -268,71 +213,47 @@ SET SESSION example_double_thdvar = 202.8882;
 
 SHOW GLOBAL STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 1, ulong_var is 200, int_var is 0, double_var is 200.888000, really
 
 SHOW SESSION STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 1, ulong_var is 200, int_var is 0, double_var is 200.888000, really
 
 SHOW GLOBAL VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	201.888100
 example_double_var	200.888000
 example_enum_var	e2
+example_int_var	0
 example_ulong_var	200
+example_varopt_default	5
 
 SHOW SESSION VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	202.888200
 example_double_var	200.888000
 example_enum_var	e2
+example_int_var	0
 example_ulong_var	200
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
 example_double_thdvar	201.888100
 example_double_var	200.888000
 example_enum_var	e2
+example_int_var	0
 example_ulong_var	200
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_double_thdvar	202.888200
-example_double_var	200.888000
-example_enum_var	e2
-example_ulong_var	200
 
 ================================================================================
 2.9 - UNINSTALL PLUGIN
@@ -374,7 +295,7 @@ TEST 3 - SESSION PLUGIN VARS ON MULTIPLE CONNECTIONS
 ================================================================================
 3.1 - INSTALL PLUGIN
 ================================================================================
-INSTALL PLUGIN example SONAME 'ha_example.so';
+INSTALL PLUGIN example SONAME 'ha_example';
 
 ================================================================================
 3.2 - SET GLOBAL AND DEFAULT CONNECTION VARS
@@ -406,80 +327,52 @@ connection default;
 
 SHOW GLOBAL STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 300, int_var is 0, double_var is 301.000000, really
 
 SHOW SESSION STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 300, int_var is 0, double_var is 301.000000, really
 
 SHOW GLOBAL VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	302.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SHOW SESSION VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	300.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
 example_double_thdvar	302.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
 
 # Variables by thread
 SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
 WHERE variable_name LIKE "example_%" ORDER BY variable_value;
 variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_thdvar	300.111100
-example_double_thdvar	300.222200
-example_double_thdvar	300.333300
 
 ================================================================================
 3.5 - DISCONNECT CLIENTS
@@ -498,77 +391,52 @@ connection default;
 
 SHOW GLOBAL STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 300, int_var is 0, double_var is 301.000000, really
 
 SHOW SESSION STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 300, int_var is 0, double_var is 301.000000, really
 
 SHOW GLOBAL VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	302.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SHOW SESSION VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	300.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
 example_double_thdvar	302.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
 
 # Variables by thread
 SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
 WHERE variable_name LIKE "example_%" ORDER BY variable_value;
 variable_name	variable_value
-example_double_thdvar	300.000000
 
 ================================================================================
 3.7 - RECONNECT 3 CLIENTS, SET SESSION VARS FOR EACH
@@ -590,80 +458,52 @@ connection default;
 
 SHOW GLOBAL STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 300, int_var is 0, double_var is 301.000000, really
 
 SHOW SESSION STATUS LIKE "example_%";
 Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
+Example_func_example	enum_var is 0, ulong_var is 300, int_var is 0, double_var is 301.000000, really
 
 SHOW GLOBAL VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	302.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SHOW SESSION VARIABLES LIKE "example_%";
 Variable_name	Value
 example_double_thdvar	300.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
 
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
 example_double_thdvar	302.000000
 example_double_var	301.000000
 example_enum_var	e1
+example_int_var	0
 example_ulong_var	300
+example_varopt_default	5
 
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
 
 # Variables by thread
 SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
 WHERE variable_name LIKE "example_%" ORDER BY variable_value;
 variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_thdvar	311.111100
-example_double_thdvar	322.222200
-example_double_thdvar	333.333300
 
 ================================================================================
 3.9 - UNINSTALL PLUGIN, LEAVE CLIENTS CONNECTED
@@ -751,110 +591,12 @@ variable_name	variable_value
 TEST 4 - BUG#18008907: DEADLOCK WITH CHANGE_USER, SHOW VARIABLES, INSTALL PLUGIN
 ================================================================================
 
-CREATE PROCEDURE install_no_such_plugin()
-BEGIN
-INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
-END|
-
-CREATE PROCEDURE show_vars()
-BEGIN
--- select on information_schema.global_variables
--- will fail, still need to cover execution of the code
--- to verify potential dead locks.
-declare continue handler for sqlexception
-begin
-end;
-SELECT COUNT(*) FROM information_schema.global_variables;
-SELECT COUNT(*) FROM performance_schema.global_variables;
-END|
-
-================================================================================
-4.1 - DEADLOCK SCENARIO 1:
-con1 - has LOCK_system_variables_hash and waits on LOCK_plugin AND
-default - has LOCK_plugin and waits on LOCK_system_variables_hash
-================================================================================
-connect con1, localhost, root,,;
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
-call show_vars();;
-connection default;
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
-call install_no_such_plugin();;
-connection con1;
-
-# Without fix, reap will hang.
-COUNT(*)
-#
-SET DEBUG_SYNC='RESET';
-connection default;
-ERROR HY000: Can't open shared library
-
-SET DEBUG_SYNC='RESET';
-
-================================================================================
-4.2 - DEADLOCK SCENARIO 2:
-default - has LOCK_system_variables_hash, waits on LOCK_global_system_variables
-con1 - has LOCK_plugin, waits on LOCK_system_variables_hash AND
-con2 - has LOCK_global_system_variables, waits on LOCK_plugin
-================================================================================
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
-call show_vars();;
-connection con1;
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
-call install_no_such_plugin();;
-connect con2, localhost, root,,;
-SET DEBUG_SYNC='now WAIT_FOR create_connection';
-
-# Without fix, deadlock situation will occur on timeout of debug_syncs in
-# default and con1.  Because of this, change_user operation hangs.
-change_user
-connection con1;
-ERROR HY000: Can't open shared library
-
-connection default;
-COUNT(*)
-#
-
-disconnect con2;
-
-================================================================================
-4.3 - DEADLOCK SCENARIO 3: CONCURRENT SHOW VARIABLES AND UNINSTALL PLUGIN
-================================================================================
-#
-# INSTALL PLUGIN
-#
-INSTALL PLUGIN example SONAME 'ha_example.so';
-connection con1;
-
-# Acquiring LOCK_system_variables_hash and LOCK_plugin_delete
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
-call show_vars();;
-connect con2, localhost, root,,;
-#
-# UNINSTALL PLUGIN
-#
-SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
-UNINSTALL PLUGIN example;;
-connection default;
-
-# Uninstall will wait until SHOW VARIABLES releases LOCK_plugin_delete.
-SET DEBUG_SYNC='now SIGNAL go';
-# Connect con1 - reap
-connection con1;
-COUNT(*)
-#
-# Connect con2 - reap
-connection con2;
 
 ================================================================================
 TEST 5 - BUG#22225549 MYSQL_CHANGE_USER/MYSQL_RESET_CONNECTION + SET INNODB...
 Update to plugin-defined session variable triggers resync with global
 variables and deadlocks on THD::LOCK_thd_sysvar.
 ================================================================================
-SELECT @@global.show_compatibility_56;
-@@global.show_compatibility_56
-0
 select @@session.innodb_strict_mode;
 @@session.innodb_strict_mode
 1
@@ -879,14 +621,6 @@ CLEAN UP
 ================================================================================
 connection default;
 
-DROP PROCEDURE show_vars;
-DROP PROCEDURE install_no_such_plugin;
-SET DEBUG_SYNC='RESET';
-
-disconnect con1;
-disconnect con2;
 
-# Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
 
 # Wait till we reached the initial number of concurrent sessions
diff --git a/mysql-test/suite/perfschema/r/show_plugin_56.result b/mysql-test/suite/perfschema/r/show_plugin_56.result
deleted file mode 100644
index d6e33cc98b6..00000000000
--- a/mysql-test/suite/perfschema/r/show_plugin_56.result
+++ /dev/null
@@ -1,871 +0,0 @@
-
-================================================================================
-SETUP
-================================================================================
-# Save the initial number of concurrent sessions
-
-# Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
-#
-# SET COMPATIBILITY MODE = ON
-#
-SET @@global.show_compatibility_56 = ON;
-
-# Verify EXAMPLE plugin is not loaded
-SELECT COUNT(*) = 0 AS "Expect 1" FROM information_schema.plugins WHERE plugin_name = "EXAMPLE";
-Expect 1
-1
-
-# Create one session to force local and global system variables;
-connect con0, localhost, root,,;
-connection default;
-
-================================================================================
-TEST 1- NO PLUGIN VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-================================================================================
-TEST 2 - PLUGIN LOAD, UNLOAD, RELOAD
-================================================================================
-================================================================================
-2.1 - INSTALL PLUGIN
-================================================================================
-INSTALL PLUGIN example SONAME 'ha_example.so';
-
-================================================================================
-2.1a - FORCE SYNC OF LOCAL AND GLOBAL SYSTEM VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	8.500000
-example_double_var	8.500000
-example_enum_var	e1
-example_ulong_var	8
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	8.500000
-example_double_var	8.500000
-example_enum_var	e1
-example_ulong_var	8
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 8, double_var is 8.500000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	8.500000
-EXAMPLE_ULONG_VAR	8
-EXAMPLE_DOUBLE_VAR	8.500000
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	8.500000
-EXAMPLE_ULONG_VAR	8
-EXAMPLE_DOUBLE_VAR	8.500000
-disconnect con0;
-
-================================================================================
-2.2 - SET PLUGIN VARS
-================================================================================
-# GLOBAL
-SET GLOBAL example_ulong_var = 100;
-SET GLOBAL example_enum_var = e1;
-SET GLOBAL example_double_var = 100.9990;
-SET GLOBAL example_double_thdvar = 101.9991;
-# SESSION
-SET SESSION example_double_thdvar = 102.9992;
-
-================================================================================
-2.3 - VERIFY UPDATED PLUGIN VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	101.999100
-example_double_var	100.999000
-example_enum_var	e1
-example_ulong_var	100
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	102.999200
-example_double_var	100.999000
-example_enum_var	e1
-example_ulong_var	100
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 100, double_var is 100.999000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	101.999100
-EXAMPLE_ULONG_VAR	100
-EXAMPLE_DOUBLE_VAR	100.999000
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	102.999200
-EXAMPLE_ULONG_VAR	100
-EXAMPLE_DOUBLE_VAR	100.999000
-
-================================================================================
-2.4 - UNINSTALL PLUGIN
-================================================================================
-UNINSTALL PLUGIN example;
-
-================================================================================
-2.5 - VERIFY NO PLUGIN VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-================================================================================
-2.6 - REINSTALL PLUGIN
-================================================================================
-# Reinstall EXAMPLE plugin
-INSTALL PLUGIN example SONAME 'ha_example.so';
-
-================================================================================
-2.7 - SET PLUGIN VARS AGAIN
-================================================================================
-# GLOBAL
-SET GLOBAL example_ulong_var = 200;
-SET GLOBAL example_enum_var = e2;
-SET GLOBAL example_double_var = 200.8880;
-SET GLOBAL example_double_thdvar = 201.8881;
-# SESSION
-SET SESSION example_double_thdvar = 202.8882;
-
-================================================================================
-2.8 - VERIFY PLUGIN VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	201.888100
-example_double_var	200.888000
-example_enum_var	e2
-example_ulong_var	200
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	202.888200
-example_double_var	200.888000
-example_enum_var	e2
-example_ulong_var	200
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 1, ulong_var is 200, double_var is 200.888000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e2
-EXAMPLE_DOUBLE_THDVAR	201.888100
-EXAMPLE_ULONG_VAR	200
-EXAMPLE_DOUBLE_VAR	200.888000
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e2
-EXAMPLE_DOUBLE_THDVAR	202.888200
-EXAMPLE_ULONG_VAR	200
-EXAMPLE_DOUBLE_VAR	200.888000
-
-================================================================================
-2.9 - UNINSTALL PLUGIN
-================================================================================
-UNINSTALL PLUGIN example;
-
-================================================================================
-2.10 - VERIFY NO PLUGIN VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-================================================================================
-TEST 3 - SESSION PLUGIN VARS ON MULTIPLE CONNECTIONS
-================================================================================
-
-================================================================================
-3.1 - INSTALL PLUGIN
-================================================================================
-INSTALL PLUGIN example SONAME 'ha_example.so';
-
-================================================================================
-3.2 - SET GLOBAL AND DEFAULT CONNECTION VARS
-================================================================================
-connection default;
-SET GLOBAL example_ulong_var = 300;
-SET GLOBAL example_enum_var = e1;
-SET GLOBAL example_double_var = 301.0000;
-SET GLOBAL example_double_thdvar = 302.0000;
-SET SESSION example_double_thdvar = 300.0000;
-
-================================================================================
-3.3 - CONNECT 3 CLIENTS, SET LOCAL PLUGIN VARS
-================================================================================
-connect con1, localhost, root,,;
-SET SESSION example_double_thdvar = 300.1111;
-
-connect con2, localhost, root,,;
-SET SESSION example_double_thdvar = 300.2222;
-
-connect con3, localhost, root,,;
-SET SESSION example_double_thdvar = 300.3333;
-
-connection default;
-
-================================================================================
-3.4 - VERIFY GLOBAL AND SESSION PLUGIN VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	302.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	300.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	302.000000
-EXAMPLE_ULONG_VAR	300
-EXAMPLE_DOUBLE_VAR	301.000000
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	300.000000
-EXAMPLE_ULONG_VAR	300
-EXAMPLE_DOUBLE_VAR	301.000000
-
-# Variables by thread
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_thdvar	300.111100
-example_double_thdvar	300.222200
-example_double_thdvar	300.333300
-
-================================================================================
-3.5 - DISCONNECT CLIENTS
-================================================================================
-connection con1;
-disconnect con1;
-connection con2;
-disconnect con2;
-connection con3;
-disconnect con3;
-connection default;
-
-================================================================================
-3.6 - VERIFY SESSION VARS ARE REMOVED
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	302.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	300.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	302.000000
-EXAMPLE_ULONG_VAR	300
-EXAMPLE_DOUBLE_VAR	301.000000
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	300.000000
-EXAMPLE_ULONG_VAR	300
-EXAMPLE_DOUBLE_VAR	301.000000
-
-# Variables by thread
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-variable_name	variable_value
-example_double_thdvar	300.000000
-
-================================================================================
-3.7 - RECONNECT 3 CLIENTS, SET SESSION VARS FOR EACH
-================================================================================
-connect con1, localhost, root,,;
-SET SESSION example_double_thdvar = 311.1111;
-
-connect con2, localhost, root,,;
-SET SESSION example_double_thdvar = 322.2222;
-
-connect con3, localhost, root,,;
-SET SESSION example_double_thdvar = 333.3333;
-
-connection default;
-
-================================================================================
-3.8 - VERIFY GLOBAL AND SESSION VARS
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-example_func_example	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-example_status_array_var1	100
-example_status_array_var2	20.010000
-example_status_var3	three hundred
-example_status_var4	ON
-example_status_var5	OFF
-example_status_var6	8250
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	302.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-example_double_thdvar	300.000000
-example_double_var	301.000000
-example_enum_var	e1
-example_ulong_var	300
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_FUNC_EXAMPLE	enum_var is 0, ulong_var is 300, double_var is 301.000000, really
-EXAMPLE_STATUS_ARRAY_VAR1	100
-EXAMPLE_STATUS_ARRAY_VAR2	20.010000
-EXAMPLE_STATUS_VAR3	three hundred
-EXAMPLE_STATUS_VAR4	ON
-EXAMPLE_STATUS_VAR5	OFF
-EXAMPLE_STATUS_VAR6	8250
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	302.000000
-EXAMPLE_ULONG_VAR	300
-EXAMPLE_DOUBLE_VAR	301.000000
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-EXAMPLE_ENUM_VAR	e1
-EXAMPLE_DOUBLE_THDVAR	300.000000
-EXAMPLE_ULONG_VAR	300
-EXAMPLE_DOUBLE_VAR	301.000000
-
-# Variables by thread
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-variable_name	variable_value
-example_double_thdvar	300.000000
-example_double_thdvar	311.111100
-example_double_thdvar	322.222200
-example_double_thdvar	333.333300
-
-================================================================================
-3.9 - UNINSTALL PLUGIN, LEAVE CLIENTS CONNECTED
-================================================================================
-UNINSTALL PLUGIN example;
-
-================================================================================
-3.10 - VERIFY SESSION VARS ARE REMOVED
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-# VARIABLES BY THREAD
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-variable_name	variable_value
-
-================================================================================
-3.11 - DISCONNECT CLIENTS
-================================================================================
-connection con1;
-disconnect con1;
-connection con2;
-disconnect con2;
-connection con3;
-disconnect con3;
-connection default;
-
-================================================================================
-3.12 - VERIFY CLIENTS ARE REMOVED
-================================================================================
-
-SHOW GLOBAL STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION STATUS LIKE "example_%";
-Variable_name	Value
-
-SHOW GLOBAL VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SHOW SESSION VARIABLES LIKE "example_%";
-Variable_name	Value
-
-SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
-variable_name	variable_value
-
-# VARIABLES BY THREAD
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-variable_name	variable_value
-
-================================================================================
-TEST 4 - BUG#18008907: DEADLOCK WITH CHANGE_USER, SHOW VARIABLES, INSTALL PLUGIN
-================================================================================
-
-CREATE PROCEDURE install_no_such_plugin()
-BEGIN
-INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
-END|
-
-CREATE PROCEDURE show_vars()
-BEGIN
--- select on information_schema.global_variables
--- will fail, still need to cover execution of the code
--- to verify potential dead locks.
-declare continue handler for sqlexception
-begin
-end;
-SELECT COUNT(*) FROM information_schema.global_variables;
-SELECT COUNT(*) FROM performance_schema.global_variables;
-END|
-
-================================================================================
-4.1 - DEADLOCK SCENARIO 1:
-con1 - has LOCK_system_variables_hash and waits on LOCK_plugin AND
-default - has LOCK_plugin and waits on LOCK_system_variables_hash
-================================================================================
-connect con1, localhost, root,,;
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
-call show_vars();;
-connection default;
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
-call install_no_such_plugin();;
-connection con1;
-
-# Without fix, reap will hang.
-COUNT(*)
-#
-COUNT(*)
-#
-SET DEBUG_SYNC='RESET';
-connection default;
-ERROR HY000: Can't open shared library
-
-SET DEBUG_SYNC='RESET';
-
-================================================================================
-4.2 - DEADLOCK SCENARIO 2:
-default - has LOCK_system_variables_hash, waits on LOCK_global_system_variables
-con1 - has LOCK_plugin, waits on LOCK_system_variables_hash AND
-con2 - has LOCK_global_system_variables, waits on LOCK_plugin
-================================================================================
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
-call show_vars();;
-connection con1;
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
-call install_no_such_plugin();;
-connect con2, localhost, root,,;
-SET DEBUG_SYNC='now WAIT_FOR create_connection';
-
-# Without fix, deadlock situation will occur on timeout of debug_syncs in
-# default and con1.  Because of this, change_user operation hangs.
-change_user
-connection con1;
-ERROR HY000: Can't open shared library
-
-connection default;
-COUNT(*)
-#
-COUNT(*)
-#
-
-disconnect con2;
-
-================================================================================
-4.3 - DEADLOCK SCENARIO 3: CONCURRENT SHOW VARIABLES AND UNINSTALL PLUGIN
-================================================================================
-#
-# INSTALL PLUGIN
-#
-INSTALL PLUGIN example SONAME 'ha_example.so';
-connection con1;
-
-# Acquiring LOCK_system_variables_hash and LOCK_plugin_delete
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
-call show_vars();;
-connect con2, localhost, root,,;
-#
-# UNINSTALL PLUGIN
-#
-SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
-UNINSTALL PLUGIN example;;
-connection default;
-
-# Uninstall will wait until SHOW VARIABLES releases LOCK_plugin_delete.
-SET DEBUG_SYNC='now SIGNAL go';
-# Connect con1 - reap
-connection con1;
-COUNT(*)
-#
-COUNT(*)
-#
-# Connect con2 - reap
-connection con2;
-
-================================================================================
-CLEAN UP
-================================================================================
-connection default;
-
-DROP PROCEDURE show_vars;
-DROP PROCEDURE install_no_such_plugin;
-SET DEBUG_SYNC='RESET';
-
-disconnect con1;
-disconnect con2;
-
-# Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
-
-# Wait till we reached the initial number of concurrent sessions
diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
index d5515baa242..424d24b1a3e 100644
--- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
+++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
@@ -1,4 +1,3 @@
-set global session_track_schema=FALSE;
 # The logging of commands and result sets is mostly disabled.
 # There are some messages which help to observe the progress of the test.
 # In case some check fails
@@ -9,7 +8,7 @@ set global session_track_schema=FALSE;
 #
 # 0. Check, build or set prequisites
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 UPDATE performance_schema.threads
 SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID();
 # 1. Basic checks
@@ -36,38 +35,14 @@ ERROR 28000: Access denied for user 'boot0123456789'@'localhost' (using password
 # 2.5 Connect should pass, host = localhost
 #     length of user name  = 10 character
 #     length of default db = 9 character
-<<<<<<< HEAD
 CREATE USER 'root012345'@'localhost';
-=======
-SET @orig_sql_mode= @@sql_mode;
-SET sql_mode= (SELECT replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 GRANT ALL PRIVILEGES ON *.* TO 'root012345'@'localhost';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-SET sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 DROP USER 'root012345'@'localhost';
 # 2.6 Connect should pass, host = localhost
 #     length of user name  = 14 character
 #     length of default db = 9 character
-<<<<<<< HEAD
 CREATE USER 'root0123456789'@'localhost';
-=======
-SET @orig_sql_mode= @@sql_mode;
-SET sql_mode= (SELECT replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 GRANT ALL PRIVILEGES ON *.* to 'root0123456789'@'localhost';
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-SET sql_mode= @orig_sql_mode;
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 DROP USER 'root0123456789'@'localhost';
 # 2.7 Connect should pass, host = my_localhost
 #     length of user name  = 4 character
@@ -246,5 +221,6 @@ connection default;
 #    It must reset all counters.
 TRUNCATE TABLE performance_schema.socket_summary_by_instance;
 # 6. Cleanup
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 connection default;
-set global session_track_schema=DEFAULT;
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_function.result b/mysql-test/suite/perfschema/r/stage_mdl_function.result
index 57393de92a4..87068e6330d 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_function.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_function.result
@@ -1,19 +1,4 @@
-<<<<<<< HEAD
 connect  con1, localhost, user1, , ;
-=======
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 drop function if exists test.f1;
 create function test.f1() returns int
 return 1;
@@ -29,51 +14,14 @@ username	event_name	sql_text
 user1	statement/sql/select	select test.f1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-<<<<<<< HEAD
-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/Closing tables	STATEMENT
-user1	stage/sql/Starting cleanup	STATEMENT
-user1	stage/sql/Freeing items	STATEMENT
-user1	stage/sql/Reset for next command	STATEMENT
-=======
-<<<<<<< HEAD
-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/Unlocking tables	STATEMENT
-user1	stage/sql/freeing items	STATEMENT
-user1	stage/sql/cleaning up	STATEMENT
-=======
-user1	stage/sql/init	STATEMENT
-user1	stage/sql/System lock	STATEMENT
-user1	stage/sql/optimizing	STATEMENT
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-user2	stage/sql/Init	STATEMENT
-=======
-<<<<<<< HEAD
-user2	stage/sql/init	STATEMENT
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-connection con1;
-=======
 user2	stage/sql/starting	STATEMENT
->>>>>>> merge-perfschema-5.7
+connection con1;
 select f1();
 f1()
 1
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result
index 0a205efee3a..b9eda506700 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_global.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result
@@ -1,19 +1,4 @@
-<<<<<<< HEAD
 connect  con1, localhost, user1, , ;
-=======
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 flush tables with read lock;
 connect  con2, localhost, user2, , ;
 insert into test.t1 values (1), (2), (3);
@@ -23,43 +8,23 @@ 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
-<<<<<<< HEAD
-user1	stage/sql/Init	STATEMENT
-user1	stage/sql/Init	STATEMENT
+user1	stage/sql/starting	STATEMENT
+user1	stage/sql/starting	STATEMENT
 user1	stage/sql/Query end	STATEMENT
 user1	stage/sql/Commit	STATEMENT
-user1	stage/sql/Closing tables	STATEMENT
-user1	stage/sql/Commit_implicit	STATEMENT
+user1	stage/sql/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
-=======
-<<<<<<< HEAD
-user1	stage/sql/init	STATEMENT
-user1	stage/sql/init	STATEMENT
-=======
-user1	stage/sql/starting	STATEMENT
->>>>>>> merge-perfschema-5.7
-user1	stage/sql/Waiting for query cache lock	STATEMENT
-user1	stage/sql/starting	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
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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 backup lock	STATEMENT
 username	event_name	nesting_event_type
-<<<<<<< HEAD
-user2	stage/sql/Init	STATEMENT
-user2	stage/sql/Checking permissions	STATEMENT
-=======
 user2	stage/sql/starting	STATEMENT
 user2	stage/sql/checking permissions	STATEMENT
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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 a6da9f8bce9..613a20fdd4f 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
@@ -1,19 +1,4 @@
-<<<<<<< HEAD
 connect  con1, localhost, user1, , ;
-=======
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 drop function if exists test.f1;
 drop procedure if exists test.p1;
 create function test.f1() returns int
@@ -36,48 +21,14 @@ username	event_name	sql_text
 user1	statement/sql/select	select test.f1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-<<<<<<< HEAD
-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/Closing tables	STATEMENT
-user1	stage/sql/Starting cleanup	STATEMENT
-user1	stage/sql/Freeing items	STATEMENT
-user1	stage/sql/Reset for next command	STATEMENT
-=======
-<<<<<<< HEAD
-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/Unlocking tables	STATEMENT
-user1	stage/sql/freeing items	STATEMENT
-user1	stage/sql/cleaning up	STATEMENT
-=======
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-user2	stage/sql/Init	STATEMENT
-=======
-<<<<<<< HEAD
-user2	stage/sql/init	STATEMENT
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-connection con1;
-=======
 user2	stage/sql/starting	STATEMENT
->>>>>>> merge-perfschema-5.7
+connection con1;
 select test.f1();
 test.f1()
 1
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result
index e058c81a960..5ba0ba04fca 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_table.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result
@@ -1,19 +1,4 @@
-<<<<<<< HEAD
 connect  con1, localhost, user1, , ;
-=======
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
->>>>>>> merge-perfschema-5.7
 begin;
 insert into test.t1 values (1), (2), (3);
 commit;
@@ -35,9 +20,9 @@ user1	stage/sql/Sending data	STATEMENT
 user1	stage/sql/End of update loop	STATEMENT
 user1	stage/sql/Query end	STATEMENT
 user1	stage/sql/Commit	STATEMENT
-user1	stage/sql/Closing tables	STATEMENT
+user1	stage/sql/closing tables	STATEMENT
 user1	stage/sql/Unlocking tables	STATEMENT
-user1	stage/sql/Closing tables	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
@@ -47,20 +32,13 @@ 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
-<<<<<<< HEAD
-user2	stage/sql/Init	STATEMENT
-user2	stage/sql/Checking permissions	STATEMENT
-user2	stage/sql/Init for update	STATEMENT
-=======
 user2	stage/sql/starting	STATEMENT
 user2	stage/sql/checking permissions	STATEMENT
-user2	stage/sql/checking permissions	STATEMENT
-user2	stage/sql/init	STATEMENT
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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 739e0477a35..00baba09fb6 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global 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 d2d1c6d3d4b..6fe051b3c42 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global 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 2385e3f9f51..b582ca072c8 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 select * from performance_schema.setup_instruments
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
index ca4e6842be4..1431f925ae2 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
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 a7fea0067df..1b9356b34a2 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global 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 5b7910f1645..c64e4f8416d 100644
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest.result b/mysql-test/suite/perfschema/r/start_server_low_digest.result
index 32feba61e33..0e9632eac4b 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_digest.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_digest.result
@@ -6,14 +6,7 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-<<<<<<< HEAD
 SELECT event_name, digest_text, sql_text FROM events_statements_history_long;
 event_name	digest_text	sql_text
 statement/sql/truncate	TRUNCATE TABLE 	truncate table events_statements_history_long
 statement/sql/select	SELECT ? + ? + 	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
-=======
-SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
-event_name	digest	digest_text	sql_text
-statement/sql/truncate	de142fd9a2507cb67f197230081a2682	TRUNCATE TABLE 	truncate table events_statements_history_long
-statement/sql/select	9c2f57893fb6bcec2ace71ddb389b46f	SELECT ? + ? + 	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
->>>>>>> merge-perfschema-5.7
diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
index 906700ba273..328fa6c7dc8 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
@@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
 event_name	digest	digest_text	sql_text
-statement/sql/truncate	de142fd9a2507cb67f197230081a2682	TRUNCATE TABLE 	truncat...
-statement/sql/select	4eaf50b33b47c3d02ab230606f197063	SELECT ? + ? + 	SELECT ...
+statement/sql/truncate	c97b12485564ff89f8b033f2455b09a2	TRUNCATE TABLE 	truncat...
+statement/sql/select	c486b94007912db388876e7965e2d8bd	SELECT ? + ? + 	SELECT ...
diff --git a/mysql-test/suite/perfschema/r/start_server_low_index.result b/mysql-test/suite/perfschema/r/start_server_low_index.result
index e829c460feb..9fd9a8a447c 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_index.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_index.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,13 +115,13 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	38
+performance_schema_max_index_stat	34
 performance_schema_max_memory_classes	320
 performance_schema_max_metadata_locks	10000
 performance_schema_max_mutex_classes	210
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
diff --git a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
index b0f3bbadfdf..981fa297971 100644
--- a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
+++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -167,14 +161,14 @@ from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1'
   order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
 COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
-3	TABLE	db1	t1
+6	TABLE	db1	t1
 flush tables;
 select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
 from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1'
   order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
 COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
-3	TABLE	db1	t1
+6	TABLE	db1	t1
 select variable_value from information_schema.global_status
 where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
 variable_value
@@ -196,15 +190,15 @@ from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1'
   order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
 COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
-6	TABLE	db1	t1
-3	TABLE	db1	t2
+12	TABLE	db1	t1
+6	TABLE	db1	t2
 flush tables;
 select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
 from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1'
   order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
 COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
-6	TABLE	db1	t1
+12	TABLE	db1	t1
 0	TABLE	db1	t2
 select variable_value > 0 from information_schema.global_status
 where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
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 d8c16eaf218..4333c6f74d2 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_account.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_account.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 161bd95a740..74c4bed9696 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 b1a539a9d0f..03a7f935317 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	0
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_cond_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_digests.result b/mysql-test/suite/perfschema/r/start_server_no_digests.result
index 7194b4a6e01..e3072cb2fe7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_digests.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_digests.result
@@ -111,13 +111,8 @@ DROP TRIGGER trg;
 ####################################
 SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
-<<<<<<< HEAD
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-SHOW VARIABLES LIKE "performance_schema_digests_size";
-=======
-SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
->>>>>>> merge-perfschema-5.7
 Variable_name	Value
 performance_schema_digests_size	0
 SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;
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 d730b836f1f..c962a74e0db 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	0
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 dbf4993b603..ef80d6e3a2d 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 ebd34e60d0a..b58acf57362 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_host.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_host.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_hosts_size";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result
index 2233f2c7210..9e7a2bf34a7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_index.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_index.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result
index d9b6c8630e3..886a1ee1633 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mdl.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
diff --git a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
index ba3e9bea7d5..a6605cc5ffb 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
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 b85faeb1a36..ae30ac59bdb 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 1910ee74ef8..1f4086500a0 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_mutex_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
index 1c047e94978..32356175e82 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
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 0e075df868f..75ebff83745 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 48c79bdcfe4..d7ebfb33d5b 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	0
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 b18c6102baa..b4b79d02b32 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 7990c668c6c..aef0eb7c14d 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	0
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 d6f8800fab9..4695c03dc34 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	0
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 0795d21c9d2..45f668bd668 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	0
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 5a213109007..cccc88ea078 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -143,7 +134,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	193
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 9068f184dd3..3631b3e401f 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 913e8b75685..bb17a80d853 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 70d0a885286..61cf11f2238 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,7 +133,7 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
+performance_schema_max_stage_classes	160
 performance_schema_max_statement_classes	0
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 704dd53458c..94811c40c53 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 6b6115805d4..4d61bf58fca 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 055f67b08ab..49b59cbc48c 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 6bc864066c3..17a10cf715e 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	0
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_table_instances";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
index b530246a27f..a93f900f650 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -165,7 +159,7 @@ a	b
 select COUNT_STAR from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
 COUNT_STAR
-3
+6
 FLUSH TABLES;
 select COUNT_STAR from performance_schema.table_lock_waits_summary_by_table
 where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
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 62338e40ae2..051c81dd12f 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 e71863fd67c..abedd06c0d9 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema_max_thread_classes";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
index f6739aa055b..1d5597f554b 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
index 581019a044f..99e170c9bb1 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
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 a512aaa31fa..46aaa06bf65 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_user.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_user.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 c934e729a86..1b717b9f768 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 425a977da1b..5691b0e7826 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
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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 e22e507f391..5dcda26313a 100644
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	0
 performance_schema_setup_actors_size	0
 performance_schema_setup_objects_size	0
 performance_schema_users_size	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global variables like "performance_schema%";
@@ -311,7 +301,7 @@ stage
 statement
 transaction
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 select * from performance_schema.cond_instances;
diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result
index 9c5dfbb4bd2..06af389a857 100644
--- a/mysql-test/suite/perfschema/r/start_server_off.result
+++ b/mysql-test/suite/perfschema/r/start_server_off.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -18,8 +17,8 @@ count(*) > 4
 select count(*) from performance_schema.setup_timers;
 count(*)
 0
-<<<<<<< HEAD
-=======
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,72 +92,66 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
-performance_schema_accounts_size	0
-performance_schema_digests_size	0
-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_transactions_history_long_size	0
-performance_schema_events_transactions_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	0
-performance_schema_max_file_classes	0
-performance_schema_max_file_handles	0
-performance_schema_max_file_instances	0
-performance_schema_max_index_stat	0
-performance_schema_max_memory_classes	0
-performance_schema_max_metadata_locks	0
-performance_schema_max_mutex_classes	0
-performance_schema_max_mutex_instances	0
-performance_schema_max_prepared_statements_instances	0
-performance_schema_max_program_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_sql_text_length	0
-performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	0
-performance_schema_max_statement_stack	0
-performance_schema_max_table_handles	0
-performance_schema_max_table_instances	0
-performance_schema_max_table_lock_stat	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
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+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_transactions_history_long_size	1000
+performance_schema_events_transactions_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	90
+performance_schema_max_cond_instances	1000
+performance_schema_max_digest_length	1024
+performance_schema_max_file_classes	80
+performance_schema_max_file_handles	32768
+performance_schema_max_file_instances	10000
+performance_schema_max_index_stat	5000
+performance_schema_max_memory_classes	320
+performance_schema_max_metadata_locks	10000
+performance_schema_max_mutex_classes	210
+performance_schema_max_mutex_instances	5000
+performance_schema_max_prepared_statements_instances	100
+performance_schema_max_program_instances	5000
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	5000
+performance_schema_max_socket_classes	10
+performance_schema_max_socket_instances	1000
+performance_schema_max_sql_text_length	1024
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
+performance_schema_max_statement_stack	10
+performance_schema_max_table_handles	1000
+performance_schema_max_table_instances	500
+performance_schema_max_table_lock_stat	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 global status like "performance_schema%";
 select * from information_schema.engines
 where engine = "PERFORMANCE_SCHEMA";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 PERFORMANCE_SCHEMA	YES	Performance Schema	NO	NO	NO
-show global status like "performance_schema%";
+show status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -204,17 +197,11 @@ OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 insert into performance_schema.setup_objects values ('TABLE', 'myschema', 'myobject', 'YES', 'YES');
-<<<<<<< HEAD
-ERROR HY000: Invalid performance_schema usage
-insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole');
 ERROR HY000: Invalid performance_schema usage
-=======
-ERROR HY000: Invalid performance_schema usage.
 insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole', 'YES', 'YES');
-ERROR HY000: Invalid performance_schema usage.
->>>>>>> 258e16fa2de... WIP 5.7 P_S
+ERROR HY000: Invalid performance_schema usage
 select * from performance_schema.setup_objects;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
 update performance_schema.setup_objects set OBJECT_NAME = 'myobject';
@@ -228,8 +215,6 @@ truncate performance_schema.events_statements_history_long;
 truncate performance_schema.events_waits_history_long;
 truncate performance_schema.setup_objects;
 truncate performance_schema.setup_actors;
-select @@global.show_compatibility_56 into @show_compatibility_56_save;
-set global show_compatibility_56 = OFF;
 show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
@@ -294,10 +279,3 @@ Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show global variables like "show_compatibility_56";
-Variable_name	Value
-show_compatibility_56	OFF
-show session variables like "show_compatibility_56";
-Variable_name	Value
-show_compatibility_56	OFF
-set @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result
index 5b7910f1645..c64e4f8416d 100644
--- a/mysql-test/suite/perfschema/r/start_server_on.result
+++ b/mysql-test/suite/perfschema/r/start_server_on.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -17,12 +16,9 @@ count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-<<<<<<< HEAD
-4
-=======
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -96,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -124,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -142,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -154,7 +145,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 show engine PERFORMANCE_SCHEMA status;
 show global status like "performance_schema%";
 show global 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
index 6199fb94f92..6ed93360d9b 100644
--- a/mysql-test/suite/perfschema/r/start_server_variables.result
+++ b/mysql-test/suite/perfschema/r/start_server_variables.result
@@ -10,15 +10,143 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-12
-select count(*) > 3 from performance_schema.setup_instruments;
-count(*) > 3
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
 1
 select count(*) from performance_schema.setup_timers;
 count(*)
-4
+5
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
+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_transactions_current;
+select * from performance_schema.events_transactions_history;
+select * from performance_schema.events_transactions_history_long;
+select * from performance_schema.events_transactions_summary_by_account_by_event_name;
+select * from performance_schema.events_transactions_summary_by_host_by_event_name;
+select * from performance_schema.events_transactions_summary_by_thread_by_event_name;
+select * from performance_schema.events_transactions_summary_by_user_by_event_name;
+select * from performance_schema.events_transactions_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.memory_summary_by_account_by_event_name;
+select * from performance_schema.memory_summary_by_host_by_event_name;
+select * from performance_schema.memory_summary_by_thread_by_event_name;
+select * from performance_schema.memory_summary_by_user_by_event_name;
+select * from performance_schema.memory_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.memory_summary_by_account_by_event_name;
+select * from performance_schema.memory_summary_by_host_by_event_name;
+select * from performance_schema.memory_summary_by_thread_by_event_name;
+select * from performance_schema.memory_summary_by_user_by_event_name;
+select * from performance_schema.memory_summary_global_by_event_name;
+select * from performance_schema.metadata_locks;
+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_handles;
+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;
+select * from performance_schema.replication_connection_configuration;
+select * from performance_schema.replication_applier_configuration;
+select * from performance_schema.replication_applier_status;
+select * from performance_schema.replication_applier_status_by_coordinator;
+select * from performance_schema.global_status;
+select * from performance_schema.status_by_thread;
+select * from performance_schema.status_by_user;
+select * from performance_schema.status_by_host;
+select * from performance_schema.status_by_account;
+select * from performance_schema.session_status;
+show global variables 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_transactions_history_long_size	1000
+performance_schema_events_transactions_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	90
+performance_schema_max_cond_instances	1000
+performance_schema_max_digest_length	1024
+performance_schema_max_file_classes	80
+performance_schema_max_file_handles	32768
+performance_schema_max_file_instances	10000
+performance_schema_max_index_stat	5000
+performance_schema_max_memory_classes	320
+performance_schema_max_metadata_locks	10000
+performance_schema_max_mutex_classes	210
+performance_schema_max_mutex_instances	5000
+performance_schema_max_prepared_statements_instances	100
+performance_schema_max_program_instances	5000
+performance_schema_max_rwlock_classes	50
+performance_schema_max_rwlock_instances	5000
+performance_schema_max_socket_classes	10
+performance_schema_max_socket_instances	1000
+performance_schema_max_sql_text_length	1024
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
+performance_schema_max_statement_stack	10
+performance_schema_max_table_handles	1000
+performance_schema_max_table_instances	500
+performance_schema_max_table_lock_stat	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 global status like "performance_schema%";
 show variables where
 `Variable_name` != "performance_schema_max_statement_classes" and
 `Variable_name` like "performance_schema%";
@@ -30,24 +158,34 @@ 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_transactions_history_long_size	1000
+performance_schema_events_transactions_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	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
+performance_schema_max_file_classes	80
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
-performance_schema_max_mutex_classes	200
+performance_schema_max_index_stat	5000
+performance_schema_max_memory_classes	320
+performance_schema_max_metadata_locks	10000
+performance_schema_max_mutex_classes	210
 performance_schema_max_mutex_instances	5000
-performance_schema_max_rwlock_classes	40
+performance_schema_max_prepared_statements_instances	100
+performance_schema_max_program_instances	5000
+performance_schema_max_rwlock_classes	50
 performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
+performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
+performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
+performance_schema_max_table_lock_stat	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	200
 performance_schema_session_connect_attrs_size	2048
diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result
index 58a6334f0b5..1dec89e8120 100644
--- a/mysql-test/suite/perfschema/r/statement_digest.result
+++ b/mysql-test/suite/perfschema/r/statement_digest.result
@@ -1,6 +1,4 @@
 SET sql_mode='NO_ENGINE_SUBSTITUTION';
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 ####################################
 # SETUP
 ####################################
@@ -114,7 +112,6 @@ DROP TRIGGER trg;
 ####################################
 SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
-<<<<<<< HEAD
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 statements_digest	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
 statements_digest	SELECT ? FROM `t1` 	2	0	0	0
@@ -151,44 +148,6 @@ statements_digest	DROP FUNCTION `func` 	1	0	0	0
 statements_digest	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1	0	0	0
 statements_digest	INSERT INTO `t12` VALUES (?) 	2	2	0	0
 statements_digest	DROP TRIGGER `trg` 	1	0	0	0
-=======
-SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-statements_digest	21b6affb55f3e69c598b47257f4d0ec6	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1	0	0	0
-statements_digest	2ebcc6539c5c79b27a33707fbd4d70b0	SELECT ? FROM `t1` 	2	0	0	0
-statements_digest	811c314bb8f68f4fdef9e30fa64acb0b	SELECT ?, ... FROM `t1` 	2	0	0	0
-statements_digest	bc458c25be72e6f386b5c646bfd2a4ac	SELECT ? FROM `t2` 	1	0	0	0
-statements_digest	ca8daaee4f2bac8419836ba3b57a945c	SELECT ?, ... FROM `t2` 	2	0	0	0
-statements_digest	15dbcb0276d0a32884e54f872e7550de	INSERT INTO `t1` VALUES (?) 	2	2	0	0
-statements_digest	69ed8a7ce05b795006d86cbbd31e0caa	INSERT INTO `t2` VALUES (?) 	1	1	0	0
-statements_digest	a33fb1d856859fc46057c7dc869ce164	INSERT INTO `t3` VALUES (...) 	4	4	0	0
-statements_digest	a77bacee82e346244fbd5d405e9acf7d	INSERT INTO `t4` VALUES (...) 	1	1	0	0
-statements_digest	5546a45fece520aaa0140e6ac7a554ca	INSERT INTO `t5` VALUES (...) 	1	1	0	0
-statements_digest	45552b7cbc35f439bb0b2cc12b4d7004	INSERT INTO `t1` VALUES (?) /* , ... */ 	2	7	0	0
-statements_digest	5e2ca7e5378a50395344cf8fb33c1289	INSERT INTO `t3` VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	5a2455a3ad5daf8ad20bad0e1ba489d8	INSERT INTO `t5` VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	db2e552003c59f77b27e8a43513fa6df	INSERT INTO `t6` VALUES (...) 	5	5	0	0
-statements_digest	6d48e7bf6ebe1075c954ca4440c313f5	SELECT ? + ? 	3	0	0	0
-statements_digest	f29eded39dd5fa102f18987679dd0c14	SELECT ? 	1	0	0	0
-statements_digest	3aeae35a7cad6d77a59795daa475ec95	CREATE SCHEMA `statements_digest_temp` 	2	2	0	0
-statements_digest	853fcddb9ccd2b9bc89b2b9ebb86b63a	DROP SCHEMA `statements_digest_temp` 	2	0	0	0
-statements_digest	35c43fea9b2c2899c5ae8576b1b00879	SELECT ? FROM `no_such_table` 	1	0	0	1
-statements_digest	0d6c1e5ce78bfc10f8f9d1c34883e431	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2	0	0	1
-statements_digest	fba453490c48b500dc5497587ac52232	DROP TABLE `dup_table` 	1	0	0	0
-statements_digest	8da8c367b38b366598c96c1f573b06ff	INSERT IGNORE INTO `t11` VALUES (?) 	1	1	1	0
-statements_digest	feaff321c54a9c8e1e9508628f7a5a05	SHOW WARNINGS 	1	0	0	0
-statements_digest	da3836703213b71919f6583391fb7de4	PREPARE `stmt` FROM ? 	1	0	0	0
-statements_digest	b5243e9f1b9b0bbcc8cafd6e5acc78f7	EXECUTE `stmt` 	2	0	0	0
-statements_digest	1943fb11508045f36626b11b1c2311b4	DEALLOCATE PREPARE `stmt` 	1	0	0	0
-statements_digest	25794340d6b31e52b8a65f672acd1a02	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1	0	0	0
-statements_digest	89b975550f7e8236ee7cc9dc1662cd04	CALL `p1` ( ) 	2	0	0	0
-statements_digest	c5ab254ec788be45b08ba6f3b41008b4	DROP PROCEDURE `p1` 	1	0	0	0
-statements_digest	85e6b42a2024f757b5e43dd231827068	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1	0	0	0
-statements_digest	6de36a178c9394679a4b8d8d1113a65d	SELECT `func` (...) 	2	0	0	0
-statements_digest	98683f018cbb76cd482f47a48921513c	DROP FUNCTION `func` 	1	0	0	0
-statements_digest	3e0d38357bc7322944bdd51b4281f144	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1	0	0	0
-statements_digest	2ea818b323d4449e3474db5f70e1bdea	INSERT INTO `t12` VALUES (?) 	2	2	0	0
-statements_digest	4dd34f225aced9cd2f50dafe64e01f1b	DROP TRIGGER `trg` 	1	0	0	0
->>>>>>> merge-perfschema-5.7
 ####################################
 # CLEANUP
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
index 6f1a7a993dd..9722c371ecf 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
@@ -126,7 +126,6 @@ DROP TRIGGER trg;
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-<<<<<<< HEAD
 SELECT schema_name,digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
 schema_name	digest_text	count_star
 statements_digest	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
@@ -166,47 +165,6 @@ statements_digest	INSERT INTO `t12` VALUES (?) 	2
 statements_digest	DROP TRIGGER `trg` 	1
 SELECT digest_text FROM performance_schema.events_statements_current;
 digest_text
-=======
-SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
-schema_name	digest	digest_text	count_star
-statements_digest	d24da32343f2b799f8a7ba1bdc45f83b	TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 	1
-statements_digest	2470c53bba1de70e17dee0ffecf92c73	SELECT ? FROM `t1` 	2
-statements_digest	7aaf73121c2dc1961757af496028610b	SELECT ?, ... FROM `t1` 	2
-statements_digest	57175aac3e410f4a0df5900bf998b181	SELECT ? FROM `t2` 	1
-statements_digest	7595674dce5accccec6d0a9c0918b689	SELECT ?, ... FROM `t2` 	2
-statements_digest	02b23366d1c2eb07f271b27a92261850	INSERT INTO `t1` VALUES (?) 	2
-statements_digest	d6935b92b93f59d1d8580d71345bf785	INSERT INTO `t2` VALUES (?) 	1
-statements_digest	0bed9d67f8f0eed70e23d8d652f850f1	INSERT INTO `t3` VALUES (...) 	4
-statements_digest	5a4288f864ee631ce51c9a2250ee05f4	INSERT INTO `t4` VALUES (...) 	1
-statements_digest	2f3f80af62a9a0bc3e65ade97b7d9b91	INSERT INTO `t5` VALUES (...) 	1
-statements_digest	9282eb80534dd560d422f0ad3e2ef79e	INSERT INTO `t1` VALUES (?) /* , ... */ 	2
-statements_digest	84fd494f2106df4a7b68a7d64c38390c	INSERT INTO `t3` VALUES (...) /* , ... */ 	1
-statements_digest	8d8c2006b523c427db1f4a64d2a3071c	INSERT INTO `t5` VALUES (...) /* , ... */ 	1
-statements_digest	119634570de383d4e24bb246f9aa5093	INSERT INTO `t6` VALUES (...) 	5
-statements_digest	d8492e72ce015b008b8a29347b1574f0	SELECT ? + ? 	3
-statements_digest	3d4fc22e33e10d7235eced3c75a84c2c	SELECT ? 	1
-statements_digest	228bd1e66dfaad7a93a08eec7cfdf840	CREATE SCHEMA `statements_digest_temp` 	2
-statements_digest	a1b8dbf6a71e58af1c93dbdb27f2979c	DROP SCHEMA `statements_digest_temp` 	2
-statements_digest	80ef2cc343a9725239f4d9d88e3ed77b	SELECT ? FROM `no_such_table` 	1
-statements_digest	66bbd419c604f474fe5a769c3d8f091c	CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 	2
-statements_digest	ae27efa5e1da98d54b2bf2af9a492780	DROP TABLE `dup_table` 	1
-statements_digest	164476310fd2576cb913120166b2f2b0	INSERT IGNORE INTO `t11` VALUES (?) 	1
-statements_digest	feaff321c54a9c8e1e9508628f7a5a05	SHOW WARNINGS 	1
-statements_digest	ba5e1127c88c3b8737000ac83579c15b	PREPARE `stmt` FROM ? 	1
-statements_digest	9e1c48512fdded3c4e64f3ac9a786096	EXECUTE `stmt` 	2
-statements_digest	26b3d4dd928dd5321d2a0e1e63d926f7	DEALLOCATE PREPARE `stmt` 	1
-statements_digest	179e0cb3ea4542473dc88fd24b209049	CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 	1
-statements_digest	cde8f1053b3b4a4d67658c9c8572e765	CALL `p1` ( ) 	2
-statements_digest	ff2582be3f542ec89d41ffc8ef018c2f	DROP PROCEDURE `p1` 	1
-statements_digest	bae719145a0d1e65cbbdec759665bd79	CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 	1
-statements_digest	27b8b33b381b70df85aa39ae223baa19	SELECT `func` (...) 	2
-statements_digest	a1686531a64227fc7d1e96f090462d7b	DROP FUNCTION `func` 	1
-statements_digest	3a668f739568e34b3ae67491f7938639	CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 	1
-statements_digest	5c24333d11c3e873088d2911f4589883	INSERT INTO `t12` VALUES (?) 	2
-statements_digest	e1ea7222497e0e50f3ee08a17ebd2542	DROP TRIGGER `trg` 	1
-SELECT digest, digest_text FROM performance_schema.events_statements_current;
-digest	digest_text
->>>>>>> merge-perfschema-5.7
 ####################################
 # CLEANUP
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
index 3b573ec2d0f..0ac1b5eb3b2 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
@@ -6,14 +6,7 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-<<<<<<< HEAD
 SELECT schema_name, digest_text, count_star FROM events_statements_summary_by_digest;
 schema_name	digest_text	count_star
 performance_schema	TRUNCATE TABLE `events_statements_summary_by_digest` 	1
 performance_schema	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1
-=======
-SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
-schema_name	digest	digest_text	count_star
-performance_schema	7b21132f2eb5d27abf79d6f1cb853171	TRUNCATE TABLE `events_statements_summary_by_digest` 	1
-performance_schema	13388524411c28030c7bbdc499ca3a3b	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1
->>>>>>> merge-perfschema-5.7
diff --git a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
index 2f0ab6988f4..ebacc9a8f7e 100644
--- a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
+++ b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
@@ -4,7 +4,6 @@ information_schema
 mtr
 mysql
 performance_schema
-sys
 test
 select count(*) from performance_schema.performance_timers;
 count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
 count(*)
 5
 Warnings:
-Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release.
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
 select * from performance_schema.replication_connection_configuration;
-select * from performance_schema.replication_connection_status;
 select * from performance_schema.replication_applier_configuration;
 select * from performance_schema.replication_applier_status;
 select * from performance_schema.replication_applier_status_by_coordinator;
-select * from performance_schema.replication_applier_status_by_worker;
 select * from performance_schema.global_status;
 select * from performance_schema.status_by_thread;
 select * from performance_schema.status_by_user;
 select * from performance_schema.status_by_host;
 select * from performance_schema.status_by_account;
 select * from performance_schema.session_status;
-select * from performance_schema.global_variables;
-select * from performance_schema.variables_by_thread;
-select * from performance_schema.session_variables;
 show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_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_classes	90
 performance_schema_max_cond_instances	1000
 performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
+performance_schema_max_stage_classes	160
+performance_schema_max_statement_classes	222
 performance_schema_max_statement_stack	2
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
@@ -172,7 +166,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-);
+) engine=innodb;
 ############################
 # Creating Stored Programs #
 ############################
diff --git a/mysql-test/suite/perfschema/r/statement_program_nested.result b/mysql-test/suite/perfschema/r/statement_program_nested.result
index 7b8f3099c80..95cbdc81a1f 100644
--- a/mysql-test/suite/perfschema/r/statement_program_nested.result
+++ b/mysql-test/suite/perfschema/r/statement_program_nested.result
@@ -13,7 +13,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-);
+) engine=innodb;
 ############################
 # Creating Stored Programs #
 ############################
@@ -1199,7 +1199,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-);
+) engine=innodb;
 ############################
 # Creating Stored Programs #
 ############################
diff --git a/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result b/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
index 7c29c4ad86f..a17dc30632d 100644
--- a/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
+++ b/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
@@ -8,11 +8,11 @@ USE stored_programs;
 CREATE TABLE t1(
 i INT NOT NULL,
 j INT
-);
+) engine=innodb;
 CREATE TABLE t2(
 name   CHAR(16) NOT NULL DEFAULT '',
 id INT NOT NULL
-);
+) engine=innodb;
 CREATE TABLE t3(
 d DATE,
 n INT,
@@ -225,11 +225,11 @@ END	NULL	NULL	0
 statement/sql/create_table	CREATE TABLE t1(
 i INT NOT NULL,
 j INT
-)	NULL	NULL	0
+) engine=innodb	NULL	NULL	0
 statement/sql/create_table	CREATE TABLE t2(
 name   CHAR(16) NOT NULL DEFAULT '',
 id INT NOT NULL
-)	NULL	NULL	0
+) engine=innodb	NULL	NULL	0
 statement/sql/create_table	CREATE TABLE t3(
 d DATE,
 n INT,
@@ -337,7 +337,7 @@ statement/sp/stmt	INSERT INTO t4(word, mean) VALUES('a','a mean')	sampleproc4	ST
 statement/sp/jump_if_not	NULL	trg1	TRANSACTION	1
 statement/sp/jump_if_not	NULL	trg1	TRANSACTION	2
 statement/sp/jump_if_not	NULL	trg1	TRANSACTION	2
-statement/sp/stmt	UPDATE t1 SET i=new.id+i	trg2	TRANSACTION	2
+statement/sp/stmt	UPDATE t1 SET i=new.id+i 	trg2	TRANSACTION	2
 statement/sp/stmt	SET @change:= @change + new.id - old.id	trg3	TRANSACTION	1
 statement/sp/stmt	SET @del:= @del + 1	trg4	TRANSACTION	1
 statement/sp/stmt	SET @del:= @del + 8 + old.j	trg5	TRANSACTION	1
@@ -377,7 +377,7 @@ data INT NOT NULL
 CREATE TABLE t2(
 n INT UNSIGNED NOT NULL, 
 f BIGINT UNSIGNED
-);
+) engine=innodb;
 ############################
 # Creating Stored Programs #
 ############################
diff --git a/mysql-test/suite/perfschema/r/statement_program_non_nested.result b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
index 16e47b52927..b7de4b84132 100644
--- a/mysql-test/suite/perfschema/r/statement_program_non_nested.result
+++ b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
@@ -9,11 +9,11 @@ USE stored_programs;
 CREATE TABLE t1(
 i INT NOT NULL,
 j INT
-);
+) engine=innodb;
 CREATE TABLE t2(
 name   CHAR(16) NOT NULL DEFAULT '',
 id INT NOT NULL
-);
+) engine=innodb;
 CREATE TABLE t3(
 d DATE,
 n INT,
@@ -244,11 +244,11 @@ END	stored_programs	NULL	NULL	NULL	NULL	0
 statement/sql/create_table	CREATE TABLE t1(
 i INT NOT NULL,
 j INT
-)	stored_programs	NULL	NULL	NULL	NULL	0
+) engine=innodb	stored_programs	NULL	NULL	NULL	NULL	0
 statement/sql/create_table	CREATE TABLE t2(
 name   CHAR(16) NOT NULL DEFAULT '',
 id INT NOT NULL
-)	stored_programs	NULL	NULL	NULL	NULL	0
+) engine=innodb	stored_programs	NULL	NULL	NULL	NULL	0
 statement/sql/create_table	CREATE TABLE t3(
 d DATE,
 n INT,
@@ -359,7 +359,7 @@ statement/sp/stmt	INSERT INTO t4(word, mean) VALUES('a','a mean')	stored_program
 statement/sp/jump_if_not	NULL	stored_programs	TRIGGER	stored_programs	trg1	TRANSACTION	1
 statement/sp/jump_if_not	NULL	stored_programs	TRIGGER	stored_programs	trg1	TRANSACTION	2
 statement/sp/jump_if_not	NULL	stored_programs	TRIGGER	stored_programs	trg1	TRANSACTION	2
-statement/sp/stmt	UPDATE t1 SET i=new.id+i	stored_programs	TRIGGER	stored_programs	trg2	TRANSACTION	2
+statement/sp/stmt	UPDATE t1 SET i=new.id+i 	stored_programs	TRIGGER	stored_programs	trg2	TRANSACTION	2
 statement/sp/stmt	SET @change:= @change + new.id - old.id	stored_programs	TRIGGER	stored_programs	trg3	TRANSACTION	1
 statement/sp/stmt	SET @del:= @del + 1	stored_programs	TRIGGER	stored_programs	trg4	TRANSACTION	1
 statement/sp/stmt	SET @del:= @del + 8 + old.j	stored_programs	TRIGGER	stored_programs	trg5	TRANSACTION	1
@@ -415,11 +415,11 @@ USE stored_programs;
 CREATE TABLE t1(
 i INT NOT NULL,
 j INT
-);
+) engine=innodb;
 CREATE TABLE t2(
 name   CHAR(16) NOT NULL DEFAULT '',
 id INT NOT NULL
-);
+) engine=innodb;
 CREATE TABLE t3(
 d DATE,
 n INT,
@@ -659,14 +659,14 @@ b INT
 # let the creation of the following stored programs fail 
 CREATE PROCEDURE fail1(IN a INT  OUT x CHAR(16)) 
 SET a=1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'OUT x CHAR(16)) 
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'OUT x CHAR(16)) 
 SET a=1' at line 1
 CREATE FUNCTION fail2(a INT , b INT) RETURNS INT
 x=SELECT COUNT(*) FROM t;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=SELECT COUNT(*) FROM t' at line 2
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=SELECT COUNT(*) FROM t' at line 2
 CREATE EVENT fail3 SCHEDULE EVERY MICROSECOND DO
 DROP TABLE t;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SCHEDULE EVERY MICROSECOND DO
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SCHEDULE EVERY MICROSECOND DO
 DROP TABLE t' at line 1
 # the below query on PS table doesn't show any rows 
 # as the creation of stored programs failed 
@@ -689,7 +689,7 @@ ERROR 42000: Incorrect number of arguments for PROCEDURE sp.p; expected 2, got 1
 SELECT f("add",1,3);
 ERROR 42000: Incorrect number of arguments for FUNCTION sp.f; expected 2, got 3
 INSERT INTO t1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
 # the below query on PS table doesn't expose any statistics as 
 # execution of the created stored porgrams failed.
 SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS
diff --git a/mysql-test/suite/perfschema/r/status_reprepare.result b/mysql-test/suite/perfschema/r/status_reprepare.result
index 222f0bc7aa8..4ff713b9200 100644
--- a/mysql-test/suite/perfschema/r/status_reprepare.result
+++ b/mysql-test/suite/perfschema/r/status_reprepare.result
@@ -2,9 +2,7 @@
 ================================================================================
 SETUP
 ================================================================================
-# Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
-SET @@global.show_compatibility_56=OFF;
+connect con1, localhost, root,,;
 CREATE TABLE test.t1 (c1 INT);
 PREPARE stmt1 FROM "SELECT c1 FROM test.t1";
 EXECUTE stmt1;
@@ -16,9 +14,9 @@ Com_stmt_reprepare	0
 SELECT * FROM performance_schema.session_status WHERE VARIABLE_NAME LIKE "%com_stmt%";
 VARIABLE_NAME	VARIABLE_VALUE
 Com_stmt_reprepare	0
-SELECT VARIABLE_VALUE FROM performance_schema.global_status
-WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare"
-  INTO @count_global_reprepare_before;
+SELECT VARIABLE_VALUE INTO @count_global_reprepare_before
+FROM performance_schema.global_status
+WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare";
 ALTER TABLE test.t1 ADD COLUMN c2 INTEGER;
 EXECUTE stmt1;
 c1
@@ -29,9 +27,9 @@ Com_stmt_reprepare	1
 SELECT * FROM performance_schema.session_status WHERE VARIABLE_NAME LIKE "%com_stmt%";
 VARIABLE_NAME	VARIABLE_VALUE
 Com_stmt_reprepare	1
-SELECT VARIABLE_VALUE FROM performance_schema.global_status
-WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare"
-  INTO @count_global_reprepare_after;
+SELECT VARIABLE_VALUE INTO @count_global_reprepare_after
+FROM performance_schema.global_status
+WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare";
 SELECT @count_global_reprepare_after - @count_global_reprepare_before;
 @count_global_reprepare_after - @count_global_reprepare_before
 1
@@ -40,5 +38,5 @@ SELECT @count_global_reprepare_after - @count_global_reprepare_before;
 CLEANUP
 ================================================================================
 DROP TABLE test.t1;
-# Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
+disconnect con1;
+connection default;
diff --git a/mysql-test/suite/perfschema/r/sxlock_func.result b/mysql-test/suite/perfschema/r/sxlock_func.result
index 0be1fcd649b..21ecd5eee0b 100644
--- a/mysql-test/suite/perfschema/r/sxlock_func.result
+++ b/mysql-test/suite/perfschema/r/sxlock_func.result
@@ -12,7 +12,6 @@ where name like "wait/synch/sxlock/%"
 order by name;
 name
 wait/synch/sxlock/innodb/btr_search_latch
-wait/synch/sxlock/innodb/checkpoint_lock
 wait/synch/sxlock/innodb/dict_operation_lock
 wait/synch/sxlock/innodb/dict_table_stats
 wait/synch/sxlock/innodb/fil_space_latch
@@ -42,7 +41,6 @@ wait/synch/sxlock/innodb/btr_search_latch
 wait/synch/sxlock/innodb/btr_search_latch
 wait/synch/sxlock/innodb/btr_search_latch
 wait/synch/sxlock/innodb/btr_search_latch
-wait/synch/sxlock/innodb/checkpoint_lock
 wait/synch/sxlock/innodb/dict_operation_lock
 wait/synch/sxlock/innodb/trx_i_s_cache_lock
 wait/synch/sxlock/innodb/trx_purge_latch
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 a51f575edf5..bc0367b83bf 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 delete from performance_schema.setup_actors
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,13 +174,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -296,56 +200,37 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
@@ -371,34 +256,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
+wait/io/table/sql/handler	23
+wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
+TABLE	test	t3	29
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -433,55 +318,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -551,56 +415,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
-=======
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -640,56 +482,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
-=======
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -771,56 +591,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -865,56 +663,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1008,56 +784,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	96
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	48
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	0
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1103,56 +857,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1195,53 +927,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1285,57 +997,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1375,57 +1064,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1464,57 +1130,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1552,57 +1195,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1639,56 +1259,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1727,53 +1325,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1812,53 +1390,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1897,53 +1455,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1982,53 +1520,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 3cfc5270277..1be707c48ed 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 delete from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,13 +183,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -305,45 +209,43 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
+TABLE	test	t1	18
+TABLE	test	t2	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
@@ -369,57 +271,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
+wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -454,61 +339,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -578,62 +442,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -673,62 +515,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -810,62 +630,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
-=======
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -910,62 +708,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
-=======
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1059,62 +835,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	144
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	72
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t2	24	8	16	0	0	0	0	8	0	16
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t2	48	16	32	8	0	0	0	8	0	16
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
-TABLE	test	t2	132
-TABLE	test	t3	184
+TABLE	test	t1	87
+TABLE	test	t2	124
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	100
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1160,62 +914,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1258,61 +990,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1356,63 +1066,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1452,63 +1139,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1547,63 +1211,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1641,63 +1282,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1734,62 +1352,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1828,61 +1424,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1921,61 +1495,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2014,61 +1566,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2107,61 +1637,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 00aad15c829..0ed76c7ef06 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 delete from performance_schema.setup_objects
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,13 +174,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -296,56 +200,37 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
@@ -371,34 +256,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
+wait/io/table/sql/handler	23
+wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
+TABLE	test	t3	29
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -433,55 +318,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -551,56 +415,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
-=======
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -640,56 +482,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
-=======
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -771,56 +591,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -865,56 +663,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1008,56 +784,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	96
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	48
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	0
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1103,56 +857,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1195,53 +927,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1285,57 +997,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1375,57 +1064,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1464,57 +1130,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1552,57 +1195,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1639,56 +1259,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1727,53 +1325,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1812,53 +1390,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1897,53 +1455,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1982,53 +1520,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 a4de9450904..5d816b58777 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 select * from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,13 +183,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -305,45 +209,43 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
+TABLE	test	t1	18
+TABLE	test	t2	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
@@ -369,57 +271,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
+wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -454,61 +339,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -578,62 +442,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -673,62 +515,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
-=======
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -810,62 +630,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
-=======
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -910,62 +708,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
-=======
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1059,62 +835,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	144
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	72
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t2	24	8	16	0	0	0	0	8	0	16
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t2	48	16	32	8	0	0	0	8	0	16
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
-TABLE	test	t2	132
-TABLE	test	t3	184
+TABLE	test	t1	87
+TABLE	test	t2	124
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	100
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1160,62 +914,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1258,61 +990,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1356,63 +1066,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1452,63 +1139,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1547,63 +1211,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1641,63 +1282,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1734,62 +1352,40 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1828,61 +1424,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1921,61 +1495,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2014,61 +1566,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2107,61 +1637,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 22b63043c9d..52ece6d289d 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 delete from performance_schema.setup_objects
@@ -52,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -263,21 +172,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-user1	wait/lock/table/sql/handler	24
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -286,81 +186,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -369,63 +246,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
+user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
+localhost	wait/io/table/sql/handler	23
+localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
+wait/io/table/sql/handler	23
+wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
+wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -433,13 +297,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -449,94 +308,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -579,13 +398,8 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -595,94 +409,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -690,13 +464,8 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -707,98 +476,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con3;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -848,116 +577,70 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	24
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	0
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -965,121 +648,75 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	24
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con4;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	0
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1136,121 +773,75 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	24
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con1;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	0
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1259,360 +850,223 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con1;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1622,110 +1076,68 @@ user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con2;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1734,110 +1146,68 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con3;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1851,104 +1221,62 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con4;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1961,103 +1289,62 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2072,100 +1359,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2190,85 +1438,51 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2303,70 +1517,41 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2405,62 +1590,37 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -2503,17 +1663,10 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-=======
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 85da5840c62..b0ea06f4254 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
@@ -51,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -272,21 +181,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-user1	wait/lock/table/sql/handler	36
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -295,91 +195,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	10	TABLE	test	t2
 wait/lock/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
+TABLE	test	t1	18
+TABLE	test	t2	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -388,71 +263,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
+user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
+localhost	wait/io/table/sql/handler	33
+localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
+wait/io/table/sql/handler	33
+wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
+wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -460,13 +322,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -476,104 +333,62 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	10	TABLE	test	t2
 wait/lock/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -616,13 +431,8 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -632,104 +442,62 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	10	TABLE	test	t2
 wait/lock/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -737,13 +505,8 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -754,108 +517,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	10	TABLE	test	t2
 wait/lock/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con3;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -905,126 +626,78 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
-TABLE	test	t2	60
-TABLE	test	t3	82
+TABLE	test	t1	41
+TABLE	test	t2	56
+TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	44
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -1032,131 +705,83 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
-TABLE	test	t2	60
-TABLE	test	t3	82
+TABLE	test	t1	41
+TABLE	test	t2	56
+TABLE	test	t3	78
 connection con4;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	44
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1213,131 +838,83 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
-TABLE	test	t2	60
-TABLE	test	t3	82
+TABLE	test	t1	41
+TABLE	test	t2	56
+TABLE	test	t3	78
 connection con1;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	44
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1346,392 +923,247 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con1;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1741,120 +1173,76 @@ user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con2;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1863,120 +1251,76 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con3;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1990,114 +1334,70 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con4;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -2110,113 +1410,70 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2231,112 +1488,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2361,97 +1575,59 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2486,82 +1662,49 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2600,74 +1743,45 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -2710,21 +1824,12 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	23	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-wait/lock/table/sql/handler	32	TABLE	test	t3
-=======
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	12	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
-wait/lock/table/sql/handler	14	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
-wait/lock/table/sql/handler	16	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 fa4fc65edc5..0a6dea739e4 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
@@ -52,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -263,21 +172,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-user1	wait/lock/table/sql/handler	24
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -286,94 +186,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -382,50 +246,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
+user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
+localhost	wait/io/table/sql/handler	23
+localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
+wait/io/table/sql/handler	23
+wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
+wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
+TABLE	test	t3	29
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -433,13 +297,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -449,94 +308,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -579,113 +398,65 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	44	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	40	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -693,16 +464,11 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
@@ -710,103 +476,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
-user2	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
 user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/lock/table/sql/handler	24
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
-user2	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user2	wait/lock/table/sql/handler	24
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	44	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	40	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -856,122 +577,70 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	116
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
-wait/io/table/sql/handler	81	TABLE	test	t3
-wait/lock/table/sql/handler	42	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	105
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
-wait/lock/table/sql/handler	15	TABLE	test	t1
 wait/io/table/sql/handler	75	TABLE	test	t3
-wait/lock/table/sql/handler	21	TABLE	test	t3
+wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -979,129 +648,75 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
-user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
-user3	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
 user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
+user2	localhost	wait/lock/table/sql/handler	24
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
-user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
-user3	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	116
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
-wait/io/table/sql/handler	81	TABLE	test	t3
-wait/lock/table/sql/handler	42	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-localhost	wait/io/table/sql/handler	105
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
-wait/lock/table/sql/handler	15	TABLE	test	t1
 wait/io/table/sql/handler	75	TABLE	test	t3
-wait/lock/table/sql/handler	21	TABLE	test	t3
+wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1158,131 +773,75 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	96
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	96
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	40	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	56	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	48
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	48
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
+wait/lock/table/sql/handler	56	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	0
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1291,513 +850,294 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1806,120 +1146,68 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1930,117 +1218,65 @@ username	status
 user3	not found
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -2053,113 +1289,62 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2174,110 +1359,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2302,90 +1438,51 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2420,70 +1517,41 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2522,62 +1590,37 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -2620,17 +1663,10 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-=======
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 50f81788dae..c2eda2b8f23 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
 HOST	USER	ROLE	ENABLED	HISTORY
@@ -51,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -272,21 +181,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-user1	wait/lock/table/sql/handler	36
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -295,104 +195,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	10	TABLE	test	t2
 wait/lock/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
+TABLE	test	t2	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -401,58 +263,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
+user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
+localhost	wait/io/table/sql/handler	33
+localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
+wait/io/table/sql/handler	33
+wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
+wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	18
+TABLE	test	t2	22
+TABLE	test	t3	29
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -460,13 +322,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -476,104 +333,62 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
 wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	10	TABLE	test	t2
 wait/lock/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
+wait/io/table/sql/handler	15	TABLE	test	t3
 wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
-wait/lock/table/sql/handler	5	TABLE	test	t1
-wait/io/table/sql/handler	10	TABLE	test	t2
-wait/lock/table/sql/handler	6	TABLE	test	t2
-wait/io/table/sql/handler	15	TABLE	test	t3
-wait/lock/table/sql/handler	7	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -616,123 +431,73 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	94
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	30	TABLE	test	t2
-wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	44	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	83
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	26	TABLE	test	t2
-wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
 wait/io/table/sql/handler	40	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -740,16 +505,11 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
@@ -757,113 +517,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
-user2	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
 user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/lock/table/sql/handler	36
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
-user2	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user2	wait/lock/table/sql/handler	36
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	94
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	30	TABLE	test	t2
-wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	44	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	83
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
-wait/lock/table/sql/handler	10	TABLE	test	t1
 wait/io/table/sql/handler	26	TABLE	test	t2
-wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
 wait/io/table/sql/handler	40	TABLE	test	t3
-wait/lock/table/sql/handler	14	TABLE	test	t3
+wait/lock/table/sql/handler	28	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -913,132 +626,78 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	170
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t2
-wait/lock/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	81	TABLE	test	t3
-wait/lock/table/sql/handler	42	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	153
-localhost	wait/lock/table/sql/handler	54
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
-wait/lock/table/sql/handler	15	TABLE	test	t1
 wait/io/table/sql/handler	48	TABLE	test	t2
-wait/lock/table/sql/handler	18	TABLE	test	t2
+wait/lock/table/sql/handler	36	TABLE	test	t2
 wait/io/table/sql/handler	75	TABLE	test	t3
-wait/lock/table/sql/handler	21	TABLE	test	t3
+wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -1046,139 +705,83 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
-user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
-user3	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
 user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
+user2	localhost	wait/lock/table/sql/handler	36
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
-user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
-user3	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	170
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t2
-wait/lock/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	81	TABLE	test	t3
-wait/lock/table/sql/handler	42	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-localhost	wait/io/table/sql/handler	153
-localhost	wait/lock/table/sql/handler	54
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
-wait/lock/table/sql/handler	15	TABLE	test	t1
 wait/io/table/sql/handler	48	TABLE	test	t2
-wait/lock/table/sql/handler	18	TABLE	test	t2
+wait/lock/table/sql/handler	36	TABLE	test	t2
 wait/io/table/sql/handler	75	TABLE	test	t3
-wait/lock/table/sql/handler	21	TABLE	test	t3
+wait/lock/table/sql/handler	42	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1235,141 +838,83 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	144
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	144
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	40	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	48	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	56	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	72
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	72
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	24	TABLE	test	t2
+wait/lock/table/sql/handler	48	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	28	TABLE	test	t3
+wait/lock/table/sql/handler	56	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t2	24	8	16	0	0	0	0	8	0	16
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t2	48	16	32	8	0	0	0	8	0	16
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
-TABLE	test	t2	132
-TABLE	test	t3	184
+TABLE	test	t1	87
+TABLE	test	t2	124
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	100
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1378,555 +923,326 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1935,130 +1251,76 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -2069,127 +1331,73 @@ username	status
 user3	not found
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -2202,123 +1410,70 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2333,122 +1488,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2473,102 +1575,59 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2603,82 +1662,49 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2717,74 +1743,45 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -2827,21 +1824,12 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	53	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-wait/lock/table/sql/handler	60	TABLE	test	t3
-=======
-wait/io/table/sql/handler	46	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
-wait/lock/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
-wait/lock/table/sql/handler	30	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result
index a4652eec52f..22fd9f9daf5 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name='global_instrumentation';
 select * from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,13 +183,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -335,8 +239,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 8df785140b2..eb4bdc0317e 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 delete from performance_schema.setup_actors
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,21 +174,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-user1	wait/lock/table/sql/handler	24
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -288,68 +188,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -358,63 +244,46 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
+user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
+localhost	wait/io/table/sql/handler	23
+localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
+wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -422,13 +291,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -438,85 +302,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -559,13 +388,8 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -575,85 +399,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -661,13 +450,8 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -678,89 +462,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con3;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -810,107 +559,66 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	0
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -918,112 +626,71 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con4;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	0
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1080,112 +747,71 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con1;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	0
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1194,333 +820,211 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con1;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1530,101 +1034,64 @@ user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con2;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1633,101 +1100,64 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con3;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1741,95 +1171,58 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con4;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1842,94 +1235,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	0
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1944,91 +1301,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2053,76 +1376,47 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2157,61 +1451,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	28
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2250,53 +1520,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
-=======
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	28
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-=======
-TABLE	test	t1	32
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	66
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 8c2a5791ade..3d993ada59f 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 delete from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,21 +183,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-user1	wait/lock/table/sql/handler	36
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -297,74 +197,60 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
+TABLE	test	t1	18
+TABLE	test	t2	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -373,69 +259,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
+user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
+localhost	wait/io/table/sql/handler	33
+localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
+wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -443,13 +312,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -459,91 +323,56 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -586,13 +415,8 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -602,91 +426,56 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -694,13 +483,8 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -711,95 +495,60 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con3;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -849,113 +598,72 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
-TABLE	test	t2	60
-TABLE	test	t3	82
+TABLE	test	t1	41
+TABLE	test	t2	56
+TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	44
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -963,118 +671,77 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
-TABLE	test	t2	60
-TABLE	test	t3	82
+TABLE	test	t1	41
+TABLE	test	t2	56
+TABLE	test	t3	78
 connection con4;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	44
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1131,118 +798,77 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	43
-TABLE	test	t2	60
-TABLE	test	t3	82
+TABLE	test	t1	41
+TABLE	test	t2	56
+TABLE	test	t3	78
 connection con1;
-=======
-TABLE	test	t1	30
-TABLE	test	t2	44
-TABLE	test	t3	64
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1251,353 +877,229 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con1;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1607,107 +1109,70 @@ user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con2;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1716,107 +1181,70 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con3;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1830,101 +1258,64 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 disconnect con4;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1937,100 +1328,64 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 connection default;
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2045,99 +1400,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2162,84 +1481,53 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2274,69 +1562,43 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	42
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2375,61 +1637,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
-=======
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	42
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	12	5	7	0	0	0	0	5	0	7
-TABLE	test	t2	14	5	9	0	0	0	0	5	0	9
-TABLE	test	t3	16	5	11	0	0	0	0	5	0	11
+TABLE	test	t1	24	10	14	4	0	0	1	5	0	7
+TABLE	test	t2	28	10	18	4	0	0	1	5	0	9
+TABLE	test	t3	32	10	22	4	0	0	1	5	0	11
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
-=======
-TABLE	test	t1	32
-TABLE	test	t2	46
-TABLE	test	t3	66
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	45
+TABLE	test	t2	60
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 86754d33fa4..0c4f6592245 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 delete from performance_schema.setup_objects
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,21 +174,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-user1	wait/lock/table/sql/handler	24
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -288,68 +188,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
 username	status
@@ -358,63 +244,46 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
+user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
+localhost	wait/io/table/sql/handler	23
+localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
+wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -422,13 +291,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -438,85 +302,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	12
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	0
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -559,104 +388,61 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -664,16 +450,11 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
@@ -681,94 +462,54 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
-user2	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
 user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/lock/table/sql/handler	24
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
-user2	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user2	wait/lock/table/sql/handler	24
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
-=======
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	24
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	0
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -818,113 +559,66 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	116
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	105
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -932,120 +626,71 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
-user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
-user3	localhost	wait/lock/table/sql/handler	24
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
 user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
+user2	localhost	wait/lock/table/sql/handler	24
 user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/lock/table/sql/handler	24
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
-user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
-user3	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
+user3	wait/lock/table/sql/handler	24
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	116
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
-=======
-localhost	wait/io/table/sql/handler	105
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	0
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1102,122 +747,71 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	96
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	96
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	12
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	12
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	48
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	48
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	0
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1226,477 +820,278 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
+user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1705,111 +1100,64 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
+user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1820,108 +1168,61 @@ username	status
 user3	not found
 username	event_name	count_star
 user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
+user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1934,104 +1235,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	0
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2046,101 +1301,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	32
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	24
-user4	localhost	wait/io/table/sql/handler	65
+user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	24
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	16
-user2	localhost	wait/io/table/sql/handler	35
-user2	localhost	wait/lock/table/sql/handler	12
-user3	localhost	wait/io/table/sql/handler	48
-user3	localhost	wait/lock/table/sql/handler	12
-user4	localhost	wait/io/table/sql/handler	61
-user4	localhost	wait/lock/table/sql/handler	12
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2165,81 +1376,47 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	16
-user2	wait/io/table/sql/handler	35
-user2	wait/lock/table/sql/handler	12
-user3	wait/io/table/sql/handler	48
-user3	wait/lock/table/sql/handler	12
-user4	wait/io/table/sql/handler	61
-user4	wait/lock/table/sql/handler	12
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2274,61 +1451,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	52
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2367,53 +1520,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
-=======
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	52
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-=======
-TABLE	test	t1	68
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	150
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 5486958ebfd..603e5950b12 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 select * from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,21 +183,12 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-user1	wait/lock/table/sql/handler	36
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -297,91 +197,60 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
+TABLE	test	t2	22
+TABLE	test	t3	29
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
 username	status
@@ -390,52 +259,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
+user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
+localhost	wait/io/table/sql/handler	33
+localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
+wait/io/table/sql/handler	33
+wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	18
+TABLE	test	t2	22
+TABLE	test	t3	29
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -443,13 +312,8 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -459,91 +323,56 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	18
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	5	2	3	0	0	0	0	2	0	3
-TABLE	test	t2	6	2	4	0	0	0	0	2	0	4
-TABLE	test	t3	7	2	5	0	0	0	0	2	0	5
+TABLE	test	t1	10	4	6	2	0	0	0	2	0	3
+TABLE	test	t2	12	4	8	2	0	0	0	2	0	4
+TABLE	test	t3	14	4	10	2	0	0	0	2	0	5
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
-=======
-TABLE	test	t1	12
-TABLE	test	t2	16
-TABLE	test	t3	22
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -586,110 +415,67 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	status
 user3	not found
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	94
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	83
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -697,16 +483,11 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
@@ -714,100 +495,60 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
-user2	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
 user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user2	localhost	wait/lock/table/sql/handler	36
 user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
-user2	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user2	wait/lock/table/sql/handler	36
 user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	94
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
-=======
-localhost	wait/io/table/sql/handler	83
-localhost	wait/lock/table/sql/handler	36
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	36
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	0	0	0	0	4	0	6
-TABLE	test	t2	12	4	8	0	0	0	0	4	0	8
-TABLE	test	t3	14	4	10	0	0	0	0	4	0	10
+TABLE	test	t1	20	8	12	4	0	0	0	4	0	6
+TABLE	test	t2	24	8	16	4	0	0	0	4	0	8
+TABLE	test	t3	28	8	20	4	0	0	0	4	0	10
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	40
-TABLE	test	t2	54
-TABLE	test	t3	72
+TABLE	test	t1	38
+TABLE	test	t2	50
+TABLE	test	t3	68
 connection con3;
-=======
-TABLE	test	t1	27
-TABLE	test	t2	38
-TABLE	test	t3	54
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -857,119 +598,72 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	170
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	153
-localhost	wait/lock/table/sql/handler	54
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -977,126 +671,77 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
-user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
-user3	localhost	wait/lock/table/sql/handler	36
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
 user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
+user2	localhost	wait/lock/table/sql/handler	36
 user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user3	localhost	wait/lock/table/sql/handler	36
 user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
-user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
-user3	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
+user3	wait/lock/table/sql/handler	36
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	170
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
-=======
-localhost	wait/io/table/sql/handler	153
-localhost	wait/lock/table/sql/handler	54
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	54
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	15	6	9	0	0	0	0	6	0	9
-TABLE	test	t2	18	6	12	0	0	0	0	6	0	12
-TABLE	test	t3	21	6	15	0	0	0	0	6	0	15
+TABLE	test	t1	30	12	18	6	0	0	0	6	0	9
+TABLE	test	t2	36	12	24	6	0	0	0	6	0	12
+TABLE	test	t3	42	12	30	6	0	0	0	6	0	15
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	65
-TABLE	test	t2	90
-TABLE	test	t3	123
+TABLE	test	t1	61
+TABLE	test	t2	84
+TABLE	test	t3	117
 connection con4;
-=======
-TABLE	test	t1	45
-TABLE	test	t2	66
-TABLE	test	t3	96
->>>>>>> merge-perfschema-5.7
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1153,128 +798,77 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	36
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	144
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	144
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	18
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	18
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	72
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	72
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	0	0	0	0	8	0	12
-TABLE	test	t2	24	8	16	0	0	0	0	8	0	16
-TABLE	test	t3	28	8	20	0	0	0	0	8	0	20
+TABLE	test	t1	40	16	24	8	0	0	0	8	0	12
+TABLE	test	t2	48	16	32	8	0	0	0	8	0	16
+TABLE	test	t3	56	16	40	8	0	0	0	8	0	20
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	93
-TABLE	test	t2	132
-TABLE	test	t3	184
+TABLE	test	t1	87
+TABLE	test	t2	124
+TABLE	test	t3	176
 connection con1;
-=======
-TABLE	test	t1	66
-TABLE	test	t2	100
-TABLE	test	t3	148
->>>>>>> merge-perfschema-5.7
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1283,503 +877,302 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
->>>>>>> merge-perfschema-5.7
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con1;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
+user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con2;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1788,117 +1181,70 @@ username	status
 user2	not found
 username	event_name	count_star
 user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
+user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con3;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1909,114 +1255,67 @@ username	status
 user3	not found
 username	event_name	count_star
 user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
+user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 disconnect con4;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -2029,110 +1328,64 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 connection default;
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2147,109 +1400,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	48
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	36
-user4	localhost	wait/io/table/sql/handler	95
+user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	36
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	24
-user2	localhost	wait/io/table/sql/handler	51
-user2	localhost	wait/lock/table/sql/handler	18
-user3	localhost	wait/io/table/sql/handler	70
-user3	localhost	wait/lock/table/sql/handler	18
-user4	localhost	wait/io/table/sql/handler	89
-user4	localhost	wait/lock/table/sql/handler	18
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2274,89 +1481,53 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	24
-user2	wait/io/table/sql/handler	51
-user2	wait/lock/table/sql/handler	18
-user3	wait/io/table/sql/handler	70
-user3	wait/lock/table/sql/handler	18
-user4	wait/io/table/sql/handler	89
-user4	wait/lock/table/sql/handler	18
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2391,69 +1562,43 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	78
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2492,61 +1637,39 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
-=======
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	78
->>>>>>> merge-perfschema-5.7
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
-TABLE	test	t1	22	9	13	0	0	0	0	9	0	13
-TABLE	test	t2	26	9	17	0	0	0	0	9	0	17
-TABLE	test	t3	30	9	21	0	0	0	0	9	0	21
+TABLE	test	t1	44	18	26	8	0	0	1	9	0	13
+TABLE	test	t2	52	18	34	8	0	0	1	9	0	17
+TABLE	test	t3	60	18	42	8	0	0	1	9	0	21
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
-=======
-TABLE	test	t1	68
-TABLE	test	t2	102
-TABLE	test	t3	150
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	91
+TABLE	test	t2	128
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 5bb2c0b8d12..abecba095bb 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,13 +176,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -298,55 +202,37 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
-=======
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
@@ -372,23 +258,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
@@ -396,10 +282,10 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -434,54 +320,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
-=======
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -551,55 +417,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
-=======
-wait/io/table/sql/handler	57
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -639,55 +484,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
-=======
-wait/io/table/sql/handler	57
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -769,55 +593,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
-=======
-wait/io/table/sql/handler	105
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -862,55 +665,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
-=======
-wait/io/table/sql/handler	105
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1004,55 +786,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1098,55 +859,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1189,50 +929,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -1278,56 +999,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1367,56 +1066,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1455,56 +1132,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1542,56 +1197,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1628,55 +1261,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1715,50 +1327,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1799,50 +1392,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1883,50 +1457,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1967,50 +1522,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 16a64442847..6df4cad7899 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,11 +185,7 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
@@ -306,27 +211,27 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
@@ -336,13 +241,14 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	10
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -367,43 +273,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
-=======
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -411,16 +303,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -455,43 +341,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
-=======
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -499,16 +371,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -578,44 +444,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
-=======
-wait/io/table/sql/handler	83
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -623,16 +474,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -672,44 +517,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
-=======
-wait/io/table/sql/handler	83
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -717,16 +547,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -808,44 +632,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
-=======
-wait/io/table/sql/handler	153
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -853,16 +662,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -907,44 +710,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
-=======
-wait/io/table/sql/handler	153
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -952,16 +740,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1055,44 +837,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1100,16 +867,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1155,44 +916,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1200,16 +946,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1252,44 +992,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1297,15 +1022,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1349,44 +1068,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1394,17 +1098,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1444,44 +1141,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1489,17 +1171,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1538,44 +1213,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1583,17 +1243,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1631,44 +1284,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1676,17 +1314,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1723,44 +1354,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1768,16 +1384,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1816,44 +1426,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1861,15 +1456,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1908,44 +1497,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1953,15 +1527,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2000,44 +1568,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2045,15 +1598,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2092,44 +1639,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2137,15 +1669,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 d26fa32d225..47397d72d4a 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,13 +176,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -298,55 +202,37 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
-=======
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
@@ -372,23 +258,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
@@ -396,10 +282,10 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -434,54 +320,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	25
-=======
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -551,55 +417,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
-=======
-wait/io/table/sql/handler	57
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -639,55 +484,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	64
-=======
-wait/io/table/sql/handler	57
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -769,55 +593,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
-=======
-wait/io/table/sql/handler	105
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -862,55 +665,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	116
-=======
-wait/io/table/sql/handler	105
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1004,55 +786,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1098,55 +859,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1189,50 +929,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -1278,56 +999,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1367,56 +1066,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1455,56 +1132,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1542,56 +1197,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1628,55 +1261,34 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1715,50 +1327,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1799,50 +1392,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1883,50 +1457,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1967,50 +1522,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 e1d2ab49814..a697a1ae36d 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,11 +185,7 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
@@ -306,27 +211,27 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
@@ -336,13 +241,14 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	10
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -367,43 +273,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
-=======
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -411,16 +303,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -455,43 +341,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	37
-=======
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -499,16 +371,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -578,44 +444,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
-=======
-wait/io/table/sql/handler	83
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -623,16 +474,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -672,44 +517,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	94
-=======
-wait/io/table/sql/handler	83
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -717,16 +547,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -808,44 +632,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
-=======
-wait/io/table/sql/handler	153
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -853,16 +662,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -907,44 +710,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	170
-=======
-wait/io/table/sql/handler	153
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -952,16 +740,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1055,44 +837,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1100,16 +867,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1155,44 +916,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1200,16 +946,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
@@ -1252,44 +992,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1297,15 +1022,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1349,44 +1068,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1394,17 +1098,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1444,44 +1141,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1489,17 +1171,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1538,44 +1213,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1583,17 +1243,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1631,44 +1284,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1676,17 +1314,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1723,44 +1354,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1768,16 +1384,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1816,44 +1426,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1861,15 +1456,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1908,44 +1497,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1953,15 +1527,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2000,44 +1568,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2045,15 +1598,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2092,44 +1639,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2137,15 +1669,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 133ff7fb046..1b0ba5e2235 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 delete from performance_schema.setup_actors
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,19 +174,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -287,89 +188,55 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -379,37 +246,37 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
@@ -417,10 +284,10 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -428,11 +295,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -443,88 +306,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -567,11 +394,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -582,88 +405,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -671,11 +458,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -687,11 +470,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -699,11 +478,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -711,68 +486,40 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con3;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -822,11 +569,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -838,11 +581,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -850,11 +589,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -862,69 +597,40 @@ user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -932,11 +638,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -949,11 +651,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -963,11 +661,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -977,69 +671,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1096,11 +761,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1113,11 +774,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1127,11 +784,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1141,69 +794,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1212,11 +836,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1229,11 +849,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1243,11 +859,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1257,79 +869,46 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1342,11 +921,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1356,11 +931,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1370,64 +941,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 set global read_only=1;
@@ -1436,11 +980,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1453,11 +993,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1467,11 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1481,70 +1013,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1560,11 +1062,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1574,11 +1072,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1588,70 +1082,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con2;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1666,11 +1130,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1680,11 +1140,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1694,70 +1150,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con3;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1771,11 +1197,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1785,11 +1207,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1799,70 +1217,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1875,11 +1263,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1889,11 +1273,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1903,69 +1283,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1980,11 +1331,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1994,11 +1341,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2008,64 +1351,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -2092,11 +1408,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2106,64 +1418,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -2200,64 +1485,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -2298,56 +1556,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	77
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-wait/io/table/sql/handler	70
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -2392,13 +1627,8 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
-=======
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 d1ef0a0dc16..b1813a1616e 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 delete from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,18 +183,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -295,42 +197,42 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
@@ -340,16 +242,17 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	10
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -359,75 +262,44 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -435,16 +307,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -452,11 +318,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -467,79 +329,48 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -547,16 +378,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -599,11 +424,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -614,79 +435,48 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -694,16 +484,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -711,11 +495,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -727,11 +507,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -739,11 +515,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -751,59 +523,36 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -811,16 +560,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con3;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -870,11 +613,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -886,11 +625,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -898,11 +633,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -910,60 +641,36 @@ user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -971,16 +678,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -988,11 +689,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1005,11 +702,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1019,11 +712,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1033,60 +722,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1094,16 +759,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1160,11 +819,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1177,11 +832,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1191,11 +842,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1205,60 +852,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1266,16 +889,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1284,11 +901,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1301,11 +914,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1315,11 +924,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1329,60 +934,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1390,26 +971,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1422,11 +993,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1436,11 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1450,60 +1013,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1511,26 +1050,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1543,11 +1072,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1557,11 +1082,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1571,60 +1092,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1632,17 +1129,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1658,11 +1148,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1672,11 +1158,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1686,60 +1168,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1747,17 +1205,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con2;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1772,11 +1223,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1786,11 +1233,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1800,60 +1243,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1861,17 +1280,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con3;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1885,11 +1297,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1899,11 +1307,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1913,60 +1317,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1974,17 +1354,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1997,11 +1370,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -2011,11 +1380,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2025,60 +1390,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2086,16 +1427,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2110,11 +1445,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -2124,11 +1455,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2138,60 +1465,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2199,15 +1502,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2232,11 +1529,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2246,60 +1539,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2307,15 +1576,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2350,60 +1613,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2411,15 +1650,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2458,52 +1691,32 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	113
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-wait/io/table/sql/handler	102
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2511,15 +1724,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -2562,15 +1769,9 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
-=======
-wait/io/table/sql/handler	20	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/io/table/sql/handler	50	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 e116e51c76a..a19d3798e8b 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 delete from performance_schema.setup_objects
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,19 +174,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -287,89 +188,55 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -379,37 +246,37 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
@@ -417,10 +284,10 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -428,11 +295,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -443,88 +306,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -567,11 +394,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -582,89 +405,52 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	44	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/io/table/sql/handler	40	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -672,11 +458,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -688,11 +470,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -700,11 +478,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -712,69 +486,40 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	64
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	64
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	44	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	57
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	57
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/io/table/sql/handler	40	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -824,11 +569,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -840,11 +581,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -852,11 +589,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -864,69 +597,40 @@ user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	116
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	116
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
-wait/io/table/sql/handler	81	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-localhost	wait/io/table/sql/handler	105
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	105
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/io/table/sql/handler	75	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -934,11 +638,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -951,11 +651,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -965,11 +661,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -979,69 +671,40 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	116
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	116
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
-wait/io/table/sql/handler	81	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-localhost	wait/io/table/sql/handler	105
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	105
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/io/table/sql/handler	75	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1098,11 +761,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1115,11 +774,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1129,11 +784,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1143,69 +794,40 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1214,11 +836,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1231,11 +849,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1245,11 +859,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1259,79 +869,46 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1344,11 +921,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1358,11 +931,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1372,64 +941,37 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -1438,11 +980,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1455,11 +993,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1469,11 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1483,70 +1013,40 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1562,11 +1062,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1576,11 +1072,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1590,70 +1082,40 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1668,11 +1130,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1682,11 +1140,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1696,70 +1150,40 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1773,11 +1197,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1787,11 +1207,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1801,70 +1217,40 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1877,11 +1263,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1891,11 +1273,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1905,69 +1283,40 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1982,11 +1331,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1996,11 +1341,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -2010,64 +1351,37 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -2094,11 +1408,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -2108,64 +1418,37 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -2202,64 +1485,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -2300,56 +1556,33 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-wait/io/table/sql/handler	166
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -2394,13 +1627,8 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
-=======
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 858e2f8114b..6266fce73ad 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 select * from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,18 +183,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -295,42 +197,42 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
@@ -340,16 +242,17 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	10
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -359,75 +262,44 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -435,16 +307,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -452,11 +318,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -467,79 +329,48 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 wait/io/table/sql/handler	8	TABLE	test	t1
-wait/io/table/sql/handler	12	TABLE	test	t2
-wait/io/table/sql/handler	17	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	7	TABLE	test	t1
 wait/io/table/sql/handler	10	TABLE	test	t2
 wait/io/table/sql/handler	15	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -547,16 +378,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -599,11 +424,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -614,80 +435,48 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	94
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	94
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	30	TABLE	test	t2
-wait/io/table/sql/handler	44	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	83
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	83
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/io/table/sql/handler	26	TABLE	test	t2
 wait/io/table/sql/handler	40	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -695,16 +484,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -712,11 +495,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -728,11 +507,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -740,11 +515,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -752,60 +523,36 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	94
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	94
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	20	TABLE	test	t1
-wait/io/table/sql/handler	30	TABLE	test	t2
-wait/io/table/sql/handler	44	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-localhost	wait/io/table/sql/handler	83
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	83
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	17	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
 wait/io/table/sql/handler	26	TABLE	test	t2
 wait/io/table/sql/handler	40	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -813,16 +560,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -872,11 +613,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -888,11 +625,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -900,11 +633,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -912,60 +641,36 @@ user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	170
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	170
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t2
-wait/io/table/sql/handler	81	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-localhost	wait/io/table/sql/handler	153
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	153
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/io/table/sql/handler	48	TABLE	test	t2
 wait/io/table/sql/handler	75	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -973,16 +678,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -990,11 +689,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1007,11 +702,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1021,11 +712,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1035,60 +722,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	170
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	170
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	35	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t2
-wait/io/table/sql/handler	81	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-localhost	wait/io/table/sql/handler	153
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	153
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	30	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
 wait/io/table/sql/handler	48	TABLE	test	t2
 wait/io/table/sql/handler	75	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1096,16 +759,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1162,11 +819,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1179,11 +832,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1193,11 +842,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1207,60 +852,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1268,16 +889,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1286,11 +901,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1303,11 +914,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1317,11 +924,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1331,60 +934,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1392,26 +971,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1424,11 +993,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1438,11 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1452,60 +1013,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1513,26 +1050,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1545,11 +1072,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1559,11 +1082,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1573,60 +1092,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1634,17 +1129,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1660,11 +1148,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1674,11 +1158,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1688,60 +1168,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1749,17 +1205,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1774,11 +1223,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1788,11 +1233,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1802,60 +1243,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1863,17 +1280,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1887,11 +1297,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1901,11 +1307,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1915,60 +1317,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1976,17 +1354,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1999,11 +1370,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -2013,11 +1380,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -2027,60 +1390,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2088,16 +1427,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -2112,11 +1445,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -2126,11 +1455,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -2140,60 +1465,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2201,15 +1502,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2234,11 +1529,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -2248,60 +1539,36 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2309,15 +1576,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2352,60 +1613,36 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2413,15 +1650,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2460,52 +1691,32 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-wait/lock/table/sql/handler	0
-execute dump_waits_history;
-event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-execute dump_waits_index_io;
-object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-wait/io/table/sql/handler	242
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2513,15 +1724,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -2564,15 +1769,9 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-<<<<<<< HEAD
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	84	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
-=======
-wait/io/table/sql/handler	46	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/io/table/sql/handler	120	TABLE	test	t3
->>>>>>> merge-perfschema-5.7
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0
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 1c9cdeba9b8..563793465c1 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,19 +176,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -289,83 +190,53 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -375,35 +246,35 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
@@ -411,10 +282,10 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -422,11 +293,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -437,82 +304,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -555,11 +390,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -570,82 +401,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -653,11 +452,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -669,11 +464,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -681,11 +472,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -693,62 +480,38 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con3;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -798,11 +561,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -814,11 +573,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -826,11 +581,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -838,63 +589,38 @@ user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -902,11 +628,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -919,11 +641,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -933,11 +651,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -947,63 +661,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1060,11 +749,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1077,11 +762,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1091,11 +772,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1105,63 +782,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1170,11 +822,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1187,11 +835,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1201,11 +845,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1215,73 +855,44 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1294,11 +905,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1308,11 +915,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1322,58 +925,35 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 set global read_only=1;
@@ -1382,11 +962,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1399,11 +975,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1413,11 +985,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1427,64 +995,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1500,11 +1042,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1514,11 +1052,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1528,64 +1062,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con2;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1600,11 +1108,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1614,11 +1118,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1628,64 +1128,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con3;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1699,11 +1173,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1713,11 +1183,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1727,64 +1193,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-disconnect con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1797,11 +1237,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1811,11 +1247,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1825,63 +1257,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	0
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1896,11 +1303,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1910,11 +1313,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1924,58 +1323,35 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -2002,11 +1378,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2016,58 +1388,35 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -2104,58 +1453,35 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	77
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	77
-=======
-localhost	wait/io/table/sql/handler	70
+localhost	wait/io/table/sql/handler	71
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -2196,50 +1522,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	77
-=======
-wait/io/table/sql/handler	70
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-=======
-TABLE	test	t1	20
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	21
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 0890b7c3fbb..8cf139c412c 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,18 +185,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -297,39 +199,39 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
@@ -339,16 +241,17 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	10
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -358,67 +261,41 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -426,16 +303,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -443,11 +314,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -458,71 +325,45 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -530,16 +371,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -582,11 +417,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -597,71 +428,45 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	37
-=======
-localhost	wait/io/table/sql/handler	32
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -669,16 +474,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -686,11 +485,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -702,11 +497,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -714,11 +505,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -726,51 +513,33 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -778,16 +547,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con3;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -837,11 +600,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -853,11 +612,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -865,11 +620,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -877,52 +628,33 @@ user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -930,16 +662,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -947,11 +673,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -964,11 +686,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -978,11 +696,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -992,52 +706,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1045,16 +740,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1111,11 +800,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1128,11 +813,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1142,11 +823,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1156,52 +833,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1209,16 +867,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1227,11 +879,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1244,11 +892,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1258,11 +902,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1272,52 +912,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1325,26 +946,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1357,11 +968,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1371,11 +978,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1385,52 +988,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1438,26 +1022,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1470,11 +1044,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1484,11 +1054,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1498,52 +1064,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1551,17 +1098,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con1;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1577,11 +1117,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1591,11 +1127,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1605,52 +1137,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1658,17 +1171,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con2;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1683,11 +1189,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1697,11 +1199,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1711,52 +1209,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1764,17 +1243,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con3;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1788,11 +1260,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1802,11 +1270,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1816,52 +1280,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1869,17 +1314,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-disconnect con4;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1892,11 +1330,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1906,11 +1340,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1920,52 +1350,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1973,16 +1384,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-connection default;
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1997,11 +1402,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -2011,11 +1412,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2025,52 +1422,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2078,15 +1456,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2111,11 +1483,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -2125,52 +1493,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2178,15 +1527,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2221,52 +1564,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	113
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	113
-=======
-localhost	wait/io/table/sql/handler	102
+localhost	wait/io/table/sql/handler	103
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2274,15 +1598,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2321,44 +1639,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	113
-=======
-wait/io/table/sql/handler	102
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	12	10	2	10	2	0	0
+TABLE	test	t1	NULL	17	11	6	11	2	4	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t2	NULL	22	18	4	18	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	30	18	12	18	4	8	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	10	2	8	2	0	8	0
-TABLE	test	t3	NULL	32	26	6	26	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_b	4	4	0	4	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	14	2	12	2	0	12	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	23	15	8	15	2	6	0
-TABLE	test	t2	36	24	12	24	4	8	0
-TABLE	test	t3	54	36	18	36	6	12	0
-=======
-TABLE	test	t1	20	12	8	12	2	6	0
+TABLE	test	t1	21	13	8	13	2	6	0
 TABLE	test	t2	32	20	12	20	4	8	0
 TABLE	test	t3	50	32	18	32	6	12	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2366,15 +1669,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	23
-TABLE	test	t2	36
-TABLE	test	t3	54
-=======
-TABLE	test	t1	20
+TABLE	test	t1	21
 TABLE	test	t2	32
 TABLE	test	t3	50
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 ac29c3a2c9a..4f97cd6be4b 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,19 +176,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	25
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -289,83 +190,53 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	22
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -375,35 +246,35 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	22
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	22
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	22
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	22
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
@@ -411,10 +282,10 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -422,11 +293,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -437,82 +304,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	25
+localhost	wait/io/table/sql/handler	23
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	25
-=======
-localhost	wait/io/table/sql/handler	22
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
-TABLE	test	t2	0
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -555,11 +390,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -570,83 +401,50 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
-=======
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -654,11 +452,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -670,11 +464,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -682,11 +472,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -694,63 +480,38 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	64
+localhost	wait/io/table/sql/handler	58
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	64
-=======
-localhost	wait/io/table/sql/handler	57
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	57
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	0
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	0
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -800,11 +561,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -816,11 +573,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -828,11 +581,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -840,63 +589,38 @@ user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	116
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	116
-=======
-localhost	wait/io/table/sql/handler	105
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	105
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -904,11 +628,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -921,11 +641,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -935,11 +651,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -949,63 +661,38 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	116
+localhost	wait/io/table/sql/handler	106
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	116
-=======
-localhost	wait/io/table/sql/handler	105
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	105
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	0
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	0
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1062,11 +749,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1079,11 +762,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1093,11 +772,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1107,63 +782,38 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1172,11 +822,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1189,11 +835,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1203,11 +845,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1217,73 +855,44 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1296,11 +905,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1310,11 +915,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1324,58 +925,35 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -1384,11 +962,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1401,11 +975,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1415,11 +985,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1429,64 +995,38 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1502,11 +1042,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1516,11 +1052,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1530,64 +1062,38 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1602,11 +1108,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1616,11 +1118,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1630,64 +1128,38 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1701,11 +1173,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1715,11 +1183,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1729,64 +1193,38 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1799,11 +1237,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1813,11 +1247,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1827,63 +1257,38 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	0
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1898,11 +1303,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	25
-=======
-user1	localhost	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1912,11 +1313,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1926,58 +1323,35 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -2004,11 +1378,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	25
-=======
-user1	wait/io/table/sql/handler	22
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -2018,58 +1388,35 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -2106,58 +1453,35 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	181
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	181
-=======
-localhost	wait/io/table/sql/handler	166
+localhost	wait/io/table/sql/handler	167
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -2198,50 +1522,31 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	181
-=======
-wait/io/table/sql/handler	166
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	0	0	0	0	0	0	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-=======
-TABLE	test	t1	46
->>>>>>> merge-perfschema-5.7
+TABLE	test	t1	47
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 94deaeb5ceb..7fed2e31955 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,18 +185,11 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-call dump_thread();
-username	event_name	count_star
-user1	wait/io/table/sql/handler	37
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -297,39 +199,39 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	32
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	32
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	32
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
+TABLE	test	t1	NULL	6	4	2	4	1	1	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	7	4	3	4	1	2	0
+TABLE	test	t1	8	5	3	5	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
 execute dump_waits_table_lock;
@@ -339,16 +241,17 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	7
+TABLE	test	t1	8
 TABLE	test	t2	10
 TABLE	test	t3	15
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -358,67 +261,41 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
-user1	localhost	wait/lock/table/sql/handler	0
-execute dump_waits_user;
-user	event_name	count_star
-user1	wait/io/table/sql/handler	32
-user1	wait/lock/table/sql/handler	0
-execute dump_waits_host;
-host	event_name	count_star
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -426,16 +303,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connect  con2, localhost, user2, , ;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
 user2@localhost is connected
@@ -443,11 +314,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -458,71 +325,45 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	37
+localhost	wait/io/table/sql/handler	33
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	37
-=======
-localhost	wait/io/table/sql/handler	32
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
-=======
-TABLE	test	t1	NULL	4	3	1	3	1	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t2	NULL	7	5	2	5	2	0	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
+TABLE	test	t2	NULL	9	5	4	5	2	2	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	3	1	2	1	0	2	0
-TABLE	test	t3	NULL	10	7	3	7	3	0	0
+TABLE	test	t2	PRIMARY	1	1	0	1	0	0	0
+TABLE	test	t3	NULL	13	7	6	7	3	3	0
 TABLE	test	t3	index_b	1	1	0	1	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	4	1	3	1	0	3	0
+TABLE	test	t3	PRIMARY	1	1	0	1	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
 TABLE	test	t1	8	5	3	5	1	2	0
-TABLE	test	t2	12	8	4	8	2	2	0
-TABLE	test	t3	17	11	6	11	3	3	0
-=======
-TABLE	test	t1	7	4	3	4	1	2	0
 TABLE	test	t2	10	6	4	6	2	2	0
 TABLE	test	t3	15	9	6	9	3	3	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -530,16 +371,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
 TABLE	test	t1	8
-TABLE	test	t2	12
-TABLE	test	t3	17
-connection con2;
-=======
-TABLE	test	t1	7
 TABLE	test	t2	10
 TABLE	test	t3	15
->>>>>>> merge-perfschema-5.7
+connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
 insert into test.t2 set a=203, b=3, c=3;
@@ -582,11 +417,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -597,72 +428,45 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	94
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	94
-=======
-localhost	wait/io/table/sql/handler	83
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	83
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -670,16 +474,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connect  con3, localhost, user3, , ;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
 user3@localhost is connected
@@ -687,11 +485,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -703,11 +497,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -715,11 +505,7 @@ user3	localhost	wait/io/table/sql/handler	0
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -727,52 +513,33 @@ user3	wait/io/table/sql/handler	0
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	94
+localhost	wait/io/table/sql/handler	84
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	94
-=======
-localhost	wait/io/table/sql/handler	83
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	83
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	0	0
-=======
-TABLE	test	t1	NULL	10	8	2	8	2	0	0
+TABLE	test	t1	NULL	14	9	5	9	2	3	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	7	2	5	2	0	5	0
-TABLE	test	t2	NULL	18	14	4	14	4	0	0
+TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t2	NULL	24	14	10	14	4	6	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	8	2	6	2	0	6	0
-TABLE	test	t3	NULL	26	20	6	20	6	0	0
+TABLE	test	t2	PRIMARY	2	2	0	2	0	0	0
+TABLE	test	t3	NULL	35	20	15	20	6	9	0
 TABLE	test	t3	index_b	3	3	0	3	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	11	2	9	2	0	9	0
+TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	20	13	7	13	2	5	0
-TABLE	test	t2	30	20	10	20	4	6	0
-TABLE	test	t3	44	29	15	29	6	9	0
-=======
-TABLE	test	t1	17	10	7	10	2	5	0
+TABLE	test	t1	18	11	7	11	2	5	0
 TABLE	test	t2	26	16	10	16	4	6	0
 TABLE	test	t3	40	25	15	25	6	9	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -780,16 +547,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	20
-TABLE	test	t2	30
-TABLE	test	t3	44
-connection con3;
-=======
-TABLE	test	t1	17
+TABLE	test	t1	18
 TABLE	test	t2	26
 TABLE	test	t3	40
->>>>>>> merge-perfschema-5.7
+connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
 insert into test.t2 set a=303, b=3, c=3;
@@ -839,11 +600,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -855,11 +612,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -867,11 +620,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -879,52 +628,33 @@ user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	170
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	170
-=======
-localhost	wait/io/table/sql/handler	153
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	153
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -932,16 +662,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connect  con4, localhost, user4, , ;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
 user4@localhost is connected
@@ -949,11 +673,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -966,11 +686,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -980,11 +696,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -994,52 +706,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	170
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	170
-=======
-localhost	wait/io/table/sql/handler	153
+localhost	wait/io/table/sql/handler	154
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	153
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	0	0
-=======
-TABLE	test	t1	NULL	18	15	3	15	3	0	0
+TABLE	test	t1	NULL	25	16	9	16	3	6	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	12	3	9	3	0	9	0
-TABLE	test	t2	NULL	33	27	6	27	6	0	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
+TABLE	test	t2	NULL	45	27	18	27	6	12	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	15	3	12	3	0	12	0
-TABLE	test	t3	NULL	48	39	9	39	9	0	0
+TABLE	test	t2	PRIMARY	3	3	0	3	0	0	0
+TABLE	test	t3	NULL	66	39	27	39	9	18	0
 TABLE	test	t3	index_b	6	6	0	6	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	21	3	18	3	0	18	0
+TABLE	test	t3	PRIMARY	3	3	0	3	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	35	23	12	23	3	9	0
-TABLE	test	t2	54	36	18	36	6	12	0
-TABLE	test	t3	81	54	27	54	9	18	0
-=======
-TABLE	test	t1	30	18	12	18	3	9	0
+TABLE	test	t1	31	19	12	19	3	9	0
 TABLE	test	t2	48	30	18	30	6	12	0
 TABLE	test	t3	75	48	27	48	9	18	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1047,16 +740,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	35
-TABLE	test	t2	54
-TABLE	test	t3	81
-connection con4;
-=======
-TABLE	test	t1	30
+TABLE	test	t1	31
 TABLE	test	t2	48
 TABLE	test	t3	75
->>>>>>> merge-perfschema-5.7
+connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
 insert into test.t2 set a=403, b=3, c=3;
@@ -1113,11 +800,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1130,11 +813,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1144,11 +823,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1158,52 +833,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1211,16 +867,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
 lock tables test.t1 write, test.t2 write, test.t3 write;
@@ -1229,11 +879,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1246,11 +892,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1260,11 +902,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1274,52 +912,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1327,26 +946,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1359,11 +968,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1373,11 +978,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1387,52 +988,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1440,26 +1022,16 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1472,11 +1044,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1486,11 +1054,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1500,52 +1064,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1553,17 +1098,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con1;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con1 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
@@ -1579,11 +1117,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1593,11 +1127,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1607,52 +1137,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1660,17 +1171,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con2;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con2 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
 username	status
@@ -1685,11 +1189,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1699,11 +1199,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1713,52 +1209,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1766,17 +1243,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con3;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con3 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
 username	status
@@ -1790,11 +1260,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1804,11 +1270,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1818,52 +1280,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1871,17 +1314,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-disconnect con4;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
-"================== con4 disconnected =================="
->>>>>>> merge-perfschema-5.7
+disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
 username	status
@@ -1894,11 +1330,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1908,11 +1340,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1922,52 +1350,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -1975,16 +1384,10 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-connection default;
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
+connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
 "================== Step 17 =================="
@@ -1999,11 +1402,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-<<<<<<< HEAD
-user1	localhost	wait/io/table/sql/handler	37
-=======
-user1	localhost	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -2013,11 +1412,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -2027,52 +1422,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2080,15 +1456,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -2113,11 +1483,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-<<<<<<< HEAD
-user1	wait/io/table/sql/handler	37
-=======
-user1	wait/io/table/sql/handler	32
->>>>>>> merge-perfschema-5.7
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -2127,52 +1493,33 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2180,15 +1527,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -2223,52 +1564,33 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-<<<<<<< HEAD
-localhost	wait/io/table/sql/handler	265
-localhost	wait/lock/table/sql/handler	0
-execute dump_waits_global;
-event_name	count_star
-wait/io/table/sql/handler	265
-=======
-localhost	wait/io/table/sql/handler	242
+localhost	wait/io/table/sql/handler	243
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2276,15 +1598,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -2323,44 +1639,29 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-<<<<<<< HEAD
-wait/io/table/sql/handler	265
-=======
-wait/io/table/sql/handler	242
->>>>>>> merge-perfschema-5.7
+wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	NULL	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	0	0
-=======
-TABLE	test	t1	NULL	28	24	4	24	4	0	0
+TABLE	test	t1	NULL	39	25	14	25	4	10	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
->>>>>>> merge-perfschema-5.7
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	18	4	14	4	0	14	0
-TABLE	test	t2	NULL	52	44	8	44	8	0	0
+TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
-TABLE	test	t2	PRIMARY	24	4	20	4	0	20	0
-TABLE	test	t3	NULL	76	64	12	64	12	0	0
+TABLE	test	t2	PRIMARY	4	4	0	4	0	0	0
+TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
-TABLE	test	t3	PRIMARY	34	4	30	4	0	30	0
+TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-<<<<<<< HEAD
-TABLE	test	t1	53	35	18	35	4	14	0
-TABLE	test	t2	84	56	28	56	8	20	0
-TABLE	test	t3	128	86	42	86	12	30	0
-=======
-TABLE	test	t1	46	28	18	28	4	14	0
+TABLE	test	t1	47	29	18	29	4	14	0
 TABLE	test	t2	76	48	28	48	8	20	0
 TABLE	test	t3	120	78	42	78	12	30	0
->>>>>>> merge-perfschema-5.7
 execute dump_waits_table_lock;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
 TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
@@ -2368,15 +1669,9 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-<<<<<<< HEAD
-TABLE	test	t1	53
-TABLE	test	t2	84
-TABLE	test	t3	128
-=======
-TABLE	test	t1	46
+TABLE	test	t1	47
 TABLE	test	t2	76
 TABLE	test	t3	120
->>>>>>> merge-perfschema-5.7
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
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 f13395ce9e2..71fd39d17bd 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,13 +176,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -323,8 +227,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 e68fdb98d08..0474543c53c 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,13 +185,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -337,8 +241,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 102463fbe72..4556c41c98d 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,13 +176,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -323,8 +227,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 ff269ebd256..9285d43c058 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,13 +185,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -337,8 +241,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 ac4b7087149..4feb933aae4 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 delete from performance_schema.setup_actors
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,13 +174,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -323,8 +227,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 25b44c4f44d..dee9ca7489c 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 delete from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,13 +183,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -338,8 +242,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 dd63dc6c25a..045a04e7fe0 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 delete from performance_schema.setup_objects
@@ -54,85 +42,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -265,13 +174,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -323,8 +227,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 821c67df14f..e912664ec2f 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 select * from performance_schema.setup_actors
@@ -53,85 +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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -274,13 +183,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -338,8 +242,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 5eb3b519e9c..eb1e66533d8 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,13 +176,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -323,8 +227,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 edaab75be68..17e3b901a3a 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,13 +185,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -337,8 +241,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 20a4489d9f0..295dcadb28e 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -56,85 +44,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -267,13 +176,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -323,8 +227,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	0
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
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 b7ee831bf39..9d98d1f84d1 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
@@ -1,15 +1,3 @@
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
-Warnings:
-Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 update performance_schema.setup_consumers
@@ -55,85 +43,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;
-<<<<<<< HEAD
-=======
-show global variables 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_transactions_history_long_size	1000
-performance_schema_events_transactions_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	80
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	10000
-performance_schema_max_index_stat	5000
-performance_schema_max_memory_classes	320
-performance_schema_max_metadata_locks	10000
-performance_schema_max_mutex_classes	210
-performance_schema_max_mutex_instances	5000
-performance_schema_max_prepared_statements_instances	100
-performance_schema_max_program_instances	5000
-performance_schema_max_rwlock_classes	50
-performance_schema_max_rwlock_instances	5000
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	1000
-performance_schema_max_sql_text_length	1024
-performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	193
-performance_schema_max_statement_stack	10
-performance_schema_max_table_handles	1000
-performance_schema_max_table_instances	500
-performance_schema_max_table_lock_stat	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 global 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_index_stat_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_memory_classes_lost	0
-Performance_schema_metadata_lock_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_nested_statement_lost	0
-Performance_schema_prepared_statements_lost	0
-Performance_schema_program_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_table_lock_stat_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 "================== Step 1 =================="
 call dump_thread();
 username	status
@@ -276,13 +185,8 @@ a	b	c	d
 select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
-<<<<<<< HEAD
 connection default;
-"================== Step 3 =================="
-=======
-"================== con1 marker =================="
 "================== Step 3-A =================="
->>>>>>> merge-perfschema-5.7
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -337,8 +241,10 @@ object_type	object_schema	object_name	count_star
 TABLE	test	t1	10
 TABLE	test	t2	12
 TABLE	test	t3	14
+connection con1;
 flush tables;
 "================== con1 FLUSH =================="
+connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result
index 09ed9433d42..e56ae8b5e0b 100644
--- a/mysql-test/suite/perfschema/r/table_schema.result
+++ b/mysql-test/suite/perfschema/r/table_schema.result
@@ -1,8 +1,7 @@
 select * from information_schema.columns where table_schema="performance_schema"
    order by table_name, ordinal_position;
-<<<<<<< HEAD
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	IS_GENERATED	GENERATION_EXPRESSION
-def	performance_schema	accounts	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	accounts	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	accounts	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
 def	performance_schema	accounts	CURRENT_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	accounts	TOTAL_CONNECTIONS	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
@@ -16,8 +15,10 @@ def	performance_schema	events_stages_current	SOURCE	5	NULL	YES	varchar	64	192	NU
 def	performance_schema	events_stages_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_current	NESTING_EVENT_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_current	NESTING_EVENT_TYPE	10	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_current	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_current	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_current	NESTING_EVENT_ID	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_current	NESTING_EVENT_TYPE	12	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -26,8 +27,10 @@ def	performance_schema	events_stages_history	SOURCE	5	NULL	YES	varchar	64	192	NU
 def	performance_schema	events_stages_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_history	NESTING_EVENT_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_history	NESTING_EVENT_TYPE	10	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history	NESTING_EVENT_ID	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history	NESTING_EVENT_TYPE	12	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -36,9 +39,11 @@ def	performance_schema	events_stages_history_long	SOURCE	5	NULL	YES	varchar	64	1
 def	performance_schema	events_stages_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_history_long	NESTING_EVENT_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_history_long	NESTING_EVENT_TYPE	10	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_summary_by_account_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history_long	NESTING_EVENT_ID	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_history_long	NESTING_EVENT_TYPE	12	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_summary_by_account_by_event_name	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -60,7 +65,7 @@ def	performance_schema	events_stages_summary_by_thread_by_event_name	SUM_TIMER_W
 def	performance_schema	events_stages_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_stages_summary_by_user_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_stages_summary_by_user_by_event_name	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_stages_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -112,7 +117,8 @@ def	performance_schema	events_statements_current	SORT_SCAN	36	NULL	NO	bigint	NUL
 def	performance_schema	events_statements_current	NO_INDEX_USED	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_current	NO_GOOD_INDEX_USED	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_current	NESTING_EVENT_ID	39	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_statements_current	NESTING_EVENT_TYPE	40	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_current	NESTING_EVENT_TYPE	40	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_current	NESTING_EVENT_LEVEL	41	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -152,7 +158,8 @@ def	performance_schema	events_statements_history	SORT_SCAN	36	NULL	NO	bigint	NUL
 def	performance_schema	events_statements_history	NO_INDEX_USED	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history	NO_GOOD_INDEX_USED	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history	NESTING_EVENT_ID	39	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_statements_history	NESTING_EVENT_TYPE	40	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_history	NESTING_EVENT_TYPE	40	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_history	NESTING_EVENT_LEVEL	41	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -192,8 +199,9 @@ def	performance_schema	events_statements_history_long	SORT_SCAN	36	NULL	NO	bigin
 def	performance_schema	events_statements_history_long	NO_INDEX_USED	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history_long	NO_GOOD_INDEX_USED	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_history_long	NESTING_EVENT_ID	39	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_statements_history_long	NESTING_EVENT_TYPE	40	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_statements_summary_by_account_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_history_long	NESTING_EVENT_TYPE	40	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_history_long	NESTING_EVENT_LEVEL	41	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_account_by_event_name	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -275,6 +283,38 @@ def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SORT_
 def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SORT_SCAN	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_NO_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_NO_GOOD_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	OBJECT_TYPE	1	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	OBJECT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	OBJECT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	COUNT_STATEMENTS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_STATEMENTS_WAIT	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	MIN_STATEMENTS_WAIT	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	AVG_STATEMENTS_WAIT	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	MAX_STATEMENTS_WAIT	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_LOCK_TIME	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_ERRORS	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_WARNINGS	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_ROWS_AFFECTED	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_ROWS_SENT	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_ROWS_EXAMINED	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_CREATED_TMP_DISK_TABLES	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_CREATED_TMP_TABLES	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SELECT_FULL_JOIN	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SELECT_FULL_RANGE_JOIN	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SELECT_RANGE	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SELECT_RANGE_CHECK	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SELECT_SCAN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SORT_MERGE_PASSES	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SORT_RANGE	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SORT_ROWS	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_SORT_SCAN	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_NO_INDEX_USED	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_program	SUM_NO_GOOD_INDEX_USED	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_thread_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -301,7 +341,7 @@ def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SOR
 def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SORT_SCAN	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_NO_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_NO_GOOD_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_statements_summary_by_user_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_statements_summary_by_user_by_event_name	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -352,6 +392,163 @@ def	performance_schema	events_statements_summary_global_by_event_name	SUM_SORT_R
 def	performance_schema	events_statements_summary_global_by_event_name	SUM_SORT_SCAN	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_global_by_event_name	SUM_NO_INDEX_USED	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_statements_summary_global_by_event_name	SUM_NO_GOOD_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	STATE	5	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ACTIVE','COMMITTED','ROLLED BACK')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	TRX_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	GTID	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	XID_FORMAT_ID	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	XID_GTRID	9	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	XID_BQUAL	10	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	XA_STATE	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	SOURCE	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	TIMER_START	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	TIMER_END	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	TIMER_WAIT	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	ACCESS_MODE	16	NULL	YES	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('READ ONLY','READ WRITE')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	ISOLATION_LEVEL	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	AUTOCOMMIT	18	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	NUMBER_OF_SAVEPOINTS	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	20	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	NUMBER_OF_RELEASE_SAVEPOINT	21	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	OBJECT_INSTANCE_BEGIN	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	NESTING_EVENT_ID	23	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_current	NESTING_EVENT_TYPE	24	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	STATE	5	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ACTIVE','COMMITTED','ROLLED BACK')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	TRX_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	GTID	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	XID_FORMAT_ID	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	XID_GTRID	9	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	XID_BQUAL	10	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	XA_STATE	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	SOURCE	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	TIMER_START	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	TIMER_END	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	TIMER_WAIT	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	ACCESS_MODE	16	NULL	YES	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('READ ONLY','READ WRITE')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	ISOLATION_LEVEL	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	AUTOCOMMIT	18	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	NUMBER_OF_SAVEPOINTS	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	20	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	NUMBER_OF_RELEASE_SAVEPOINT	21	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	OBJECT_INSTANCE_BEGIN	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	NESTING_EVENT_ID	23	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history	NESTING_EVENT_TYPE	24	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	STATE	5	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ACTIVE','COMMITTED','ROLLED BACK')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	TRX_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	GTID	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	XID_FORMAT_ID	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	XID_GTRID	9	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	XID_BQUAL	10	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	XA_STATE	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	SOURCE	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	TIMER_START	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	TIMER_END	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	TIMER_WAIT	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	ACCESS_MODE	16	NULL	YES	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('READ ONLY','READ WRITE')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	ISOLATION_LEVEL	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	AUTOCOMMIT	18	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	NUMBER_OF_SAVEPOINTS	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	20	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	NUMBER_OF_RELEASE_SAVEPOINT	21	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	OBJECT_INSTANCE_BEGIN	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	NESTING_EVENT_ID	23	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_history_long	NESTING_EVENT_TYPE	24	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	COUNT_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	SUM_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	MIN_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	AVG_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	MAX_TIMER_READ_WRITE	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	COUNT_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	SUM_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	MIN_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	AVG_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_account_by_event_name	MAX_TIMER_READ_ONLY	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	COUNT_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	SUM_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	MIN_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	AVG_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	MAX_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	COUNT_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	SUM_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	MIN_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	AVG_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_host_by_event_name	MAX_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	COUNT_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	SUM_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	MIN_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	AVG_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	MAX_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	COUNT_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	SUM_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	MIN_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	AVG_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_thread_by_event_name	MAX_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	COUNT_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	SUM_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	MIN_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	AVG_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	MAX_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	COUNT_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	SUM_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	MIN_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	AVG_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_by_user_by_event_name	MAX_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	COUNT_READ_WRITE	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	SUM_TIMER_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	MIN_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	AVG_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	MAX_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	COUNT_READ_ONLY	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	SUM_TIMER_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	MIN_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	AVG_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_transactions_summary_global_by_event_name	MAX_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -367,7 +564,7 @@ def	performance_schema	events_waits_current	INDEX_NAME	12	NULL	YES	varchar	64	19
 def	performance_schema	events_waits_current	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_waits_current	NESTING_EVENT_TYPE	16	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_waits_current	NESTING_EVENT_TYPE	16	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_current	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		NEVER	NULL
@@ -386,7 +583,7 @@ def	performance_schema	events_waits_history	INDEX_NAME	12	NULL	YES	varchar	64	19
 def	performance_schema	events_waits_history	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_waits_history	NESTING_EVENT_TYPE	16	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_waits_history	NESTING_EVENT_TYPE	16	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		NEVER	NULL
@@ -405,11 +602,11 @@ def	performance_schema	events_waits_history_long	INDEX_NAME	12	NULL	YES	varchar
 def	performance_schema	events_waits_history_long	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history_long	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history_long	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_waits_history_long	NESTING_EVENT_TYPE	16	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_waits_history_long	NESTING_EVENT_TYPE	16	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history_long	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history_long	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_history_long	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_waits_summary_by_account_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_waits_summary_by_account_by_event_name	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -438,7 +635,7 @@ def	performance_schema	events_waits_summary_by_thread_by_event_name	SUM_TIMER_WA
 def	performance_schema	events_waits_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	events_waits_summary_by_user_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	events_waits_summary_by_user_by_event_name	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	events_waits_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -502,6 +699,8 @@ def	performance_schema	file_summary_by_instance	SUM_TIMER_MISC	22	NULL	NO	bigint
 def	performance_schema	file_summary_by_instance	MIN_TIMER_MISC	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	file_summary_by_instance	AVG_TIMER_MISC	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	file_summary_by_instance	MAX_TIMER_MISC	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	global_status	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	global_status	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
 def	performance_schema	hosts	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
 def	performance_schema	hosts	CURRENT_CONNECTIONS	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	hosts	TOTAL_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
@@ -534,6 +733,76 @@ def	performance_schema	host_cache	FIRST_SEEN	26	'0000-00-00 00:00:00'	NO	timesta
 def	performance_schema	host_cache	LAST_SEEN	27	'0000-00-00 00:00:00'	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		NEVER	NULL
 def	performance_schema	host_cache	FIRST_ERROR_SEEN	28	'0000-00-00 00:00:00'	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		NEVER	NULL
 def	performance_schema	host_cache	LAST_ERROR_SEEN	29	'0000-00-00 00:00:00'	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	COUNT_ALLOC	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	COUNT_FREE	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	SUM_NUMBER_OF_BYTES_FREE	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	LOW_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	CURRENT_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	HIGH_COUNT_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	LOW_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_account_by_event_name	HIGH_NUMBER_OF_BYTES_USED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	COUNT_ALLOC	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	COUNT_FREE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	SUM_NUMBER_OF_BYTES_FREE	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	LOW_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	CURRENT_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	HIGH_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	LOW_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_host_by_event_name	HIGH_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	COUNT_ALLOC	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	COUNT_FREE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	SUM_NUMBER_OF_BYTES_FREE	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	LOW_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	CURRENT_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	HIGH_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	LOW_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_thread_by_event_name	HIGH_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	COUNT_ALLOC	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	COUNT_FREE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	SUM_NUMBER_OF_BYTES_FREE	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	LOW_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	CURRENT_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	HIGH_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	LOW_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_by_user_by_event_name	HIGH_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	COUNT_ALLOC	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	COUNT_FREE	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	SUM_NUMBER_OF_BYTES_FREE	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	LOW_COUNT_USED	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	CURRENT_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	HIGH_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	LOW_NUMBER_OF_BYTES_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	memory_summary_global_by_event_name	HIGH_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	OBJECT_TYPE	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	OBJECT_INSTANCE_BEGIN	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	LOCK_TYPE	5	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	LOCK_DURATION	6	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	LOCK_STATUS	7	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	SOURCE	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	OWNER_THREAD_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	metadata_locks	OWNER_EVENT_ID	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	mutex_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	mutex_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	mutex_instances	LOCKED_BY_THREAD_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -549,6 +818,72 @@ def	performance_schema	performance_timers	TIMER_NAME	1	NULL	NO	enum	11	33	NULL	N
 def	performance_schema	performance_timers	TIMER_FREQUENCY	2	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	performance_timers	TIMER_RESOLUTION	3	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	performance_timers	TIMER_OVERHEAD	4	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	OBJECT_INSTANCE_BEGIN	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	STATEMENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	STATEMENT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SQL_TEXT	4	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	OWNER_THREAD_ID	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	OWNER_EVENT_ID	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	OWNER_OBJECT_TYPE	7	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER')			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	OWNER_OBJECT_SCHEMA	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	OWNER_OBJECT_NAME	9	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	TIMER_PREPARE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	COUNT_REPREPARE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	COUNT_EXECUTE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_TIMER_EXECUTE	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	MIN_TIMER_EXECUTE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	AVG_TIMER_EXECUTE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	MAX_TIMER_EXECUTE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_LOCK_TIME	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_ERRORS	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_WARNINGS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_ROWS_AFFECTED	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_ROWS_SENT	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_ROWS_EXAMINED	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_CREATED_TMP_DISK_TABLES	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_CREATED_TMP_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SELECT_FULL_JOIN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SELECT_FULL_RANGE_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SELECT_RANGE	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SELECT_RANGE_CHECK	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SELECT_SCAN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SORT_MERGE_PASSES	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SORT_RANGE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SORT_ROWS	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_SORT_SCAN	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_NO_INDEX_USED	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	prepared_statements_instances	SUM_NO_GOOD_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_configuration	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_configuration	DESIRED_DELAY	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status	SERVICE_STATE	2	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ON','OFF')			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status	REMAINING_DELAY	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status	COUNT_TRANSACTIONS_RETRIES	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status_by_coordinator	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status_by_coordinator	THREAD_ID	2	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status_by_coordinator	SERVICE_STATE	3	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ON','OFF')			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status_by_coordinator	LAST_ERROR_NUMBER	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status_by_coordinator	LAST_ERROR_MESSAGE	5	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_applier_status_by_coordinator	LAST_ERROR_TIMESTAMP	6	current_timestamp()	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp		on update current_timestamp()	select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	HOST	2	NULL	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	PORT	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	USER	4	NULL	NO	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	NETWORK_INTERFACE	5	NULL	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	AUTO_POSITION	6	NULL	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('1','0')			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_ALLOWED	7	NULL	NO	enum	7	21	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO','IGNORED')			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_CA_FILE	8	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_CA_PATH	9	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_CERTIFICATE	10	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_CIPHER	11	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_KEY	12	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_VERIFY_SERVER_CERTIFICATE	13	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_CRL_FILE	14	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	SSL_CRL_PATH	15	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	CONNECTION_RETRY_INTERVAL	16	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	CONNECTION_RETRY_COUNT	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	replication_connection_configuration	HEARTBEAT_INTERVAL	18	NULL	NO	double	NULL	NULL	10	3	NULL	NULL	NULL	double(10,3) unsigned			select,insert,update,references	Number of seconds after which a heartbeat will be sent .	NEVER	NULL
+def	performance_schema	replication_connection_configuration	TLS_VERSION	19	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		NEVER	NULL
 def	performance_schema	rwlock_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	rwlock_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	rwlock_instances	WRITE_LOCKED_BY_THREAD_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
@@ -561,15 +896,19 @@ def	performance_schema	session_connect_attrs	PROCESSLIST_ID	1	NULL	NO	int	NULL	N
 def	performance_schema	session_connect_attrs	ATTR_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_bin	varchar(32)			select,insert,update,references		NEVER	NULL
 def	performance_schema	session_connect_attrs	ATTR_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_bin	varchar(1024)			select,insert,update,references		NEVER	NULL
 def	performance_schema	session_connect_attrs	ORDINAL_POSITION	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		NEVER	NULL
+def	performance_schema	session_status	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	session_status	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_actors	HOST	1	'%'	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
-def	performance_schema	setup_actors	USER	2	'%'	NO	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	setup_actors	USER	2	'%'	NO	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_actors	ROLE	3	'%'	NO	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	setup_actors	ENABLED	4	'YES'	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
+def	performance_schema	setup_actors	HISTORY	5	'YES'	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_consumers	NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_consumers	ENABLED	2	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_instruments	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_instruments	ENABLED	2	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_instruments	TIMED	3	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
-def	performance_schema	setup_objects	OBJECT_TYPE	1	'TABLE'	NO	enum	5	15	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TABLE')			select,insert,update,references		NEVER	NULL
+def	performance_schema	setup_objects	OBJECT_TYPE	1	'TABLE'	NO	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER')			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_objects	OBJECT_SCHEMA	2	'%'	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_objects	OBJECT_NAME	3	'%'	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	setup_objects	ENABLED	4	'YES'	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
@@ -630,6 +969,27 @@ def	performance_schema	socket_summary_by_instance	SUM_TIMER_MISC	21	NULL	NO	bigi
 def	performance_schema	socket_summary_by_instance	MIN_TIMER_MISC	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	socket_summary_by_instance	AVG_TIMER_MISC	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	socket_summary_by_instance	MAX_TIMER_MISC	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_account	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_account	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_account	VARIABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_account	VARIABLE_VALUE	4	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_host	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_host	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_host	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_thread	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_thread	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_thread	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_user	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_user	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	status_by_user	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	OBJECT_TYPE	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	OBJECT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	OBJECT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	OBJECT_INSTANCE_BEGIN	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	OWNER_THREAD_ID	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	OWNER_EVENT_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	INTERNAL_LOCK	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	table_handles	EXTERNAL_LOCK	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	table_io_waits_summary_by_index_usage	OBJECT_TYPE	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	table_io_waits_summary_by_index_usage	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	table_io_waits_summary_by_index_usage	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
@@ -784,7 +1144,7 @@ def	performance_schema	threads	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NU
 def	performance_schema	threads	NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	TYPE	3	NULL	NO	varchar	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	PROCESSLIST_ID	4	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
-def	performance_schema	threads	PROCESSLIST_USER	5	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	threads	PROCESSLIST_USER	5	NULL	YES	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	PROCESSLIST_HOST	6	NULL	YES	varchar	60	180	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(60)			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	PROCESSLIST_DB	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	PROCESSLIST_COMMAND	8	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select,insert,update,references		NEVER	NULL
@@ -794,1240 +1154,38 @@ def	performance_schema	threads	PROCESSLIST_INFO	11	NULL	YES	longtext	4294967295
 def	performance_schema	threads	PARENT_THREAD_ID	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	ROLE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
 def	performance_schema	threads	INSTRUMENTED	14	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
-def	performance_schema	users	USER	1	NULL	YES	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	threads	HISTORY	15	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		NEVER	NULL
+def	performance_schema	threads	CONNECTION_TYPE	16	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select,insert,update,references		NEVER	NULL
+def	performance_schema	threads	THREAD_OS_ID	17	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	users	USER	1	NULL	YES	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references		NEVER	NULL
 def	performance_schema	users	CURRENT_CONNECTIONS	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
 def	performance_schema	users	TOTAL_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		NEVER	NULL
-=======
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	GENERATION_EXPRESSION
-def	performance_schema	accounts	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	accounts	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	accounts	CURRENT_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	accounts	TOTAL_CONNECTIONS	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	cond_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	cond_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_current	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_stages_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	NESTING_EVENT_ID	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_current	NESTING_EVENT_TYPE	12	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_stages_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_history	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_stages_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	NESTING_EVENT_ID	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history	NESTING_EVENT_TYPE	12	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_stages_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_history_long	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_stages_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	WORK_COMPLETED	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	WORK_ESTIMATED	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	NESTING_EVENT_ID	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_history_long	NESTING_EVENT_TYPE	12	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_account_by_event_name	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_host_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_by_user_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_stages_summary_global_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_global_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_global_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_global_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_stages_summary_global_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_current	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SQL_TEXT	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_current	DIGEST	11	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_statements_current	DIGEST_TEXT	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_current	CURRENT_SCHEMA	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_current	OBJECT_TYPE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_current	OBJECT_SCHEMA	15	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_current	OBJECT_NAME	16	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_current	OBJECT_INSTANCE_BEGIN	17	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	MYSQL_ERRNO	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_statements_current	RETURNED_SQLSTATE	19	NULL	YES	varchar	5	15	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references		
-def	performance_schema	events_statements_current	MESSAGE_TEXT	20	NULL	YES	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_current	ERRORS	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	WARNINGS	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	ROWS_AFFECTED	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	ROWS_SENT	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	ROWS_EXAMINED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	CREATED_TMP_DISK_TABLES	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	CREATED_TMP_TABLES	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SELECT_FULL_JOIN	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SELECT_FULL_RANGE_JOIN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SELECT_RANGE	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SELECT_RANGE_CHECK	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SELECT_SCAN	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SORT_MERGE_PASSES	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SORT_RANGE	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SORT_ROWS	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	SORT_SCAN	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	NO_INDEX_USED	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	NO_GOOD_INDEX_USED	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	NESTING_EVENT_ID	39	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_current	NESTING_EVENT_TYPE	40	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_statements_current	NESTING_EVENT_LEVEL	41	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_statements_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_history	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SQL_TEXT	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_history	DIGEST	11	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_statements_history	DIGEST_TEXT	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_history	CURRENT_SCHEMA	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history	OBJECT_TYPE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history	OBJECT_SCHEMA	15	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history	OBJECT_NAME	16	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history	OBJECT_INSTANCE_BEGIN	17	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	MYSQL_ERRNO	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_statements_history	RETURNED_SQLSTATE	19	NULL	YES	varchar	5	15	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references		
-def	performance_schema	events_statements_history	MESSAGE_TEXT	20	NULL	YES	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_history	ERRORS	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	WARNINGS	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	ROWS_AFFECTED	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	ROWS_SENT	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	ROWS_EXAMINED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	CREATED_TMP_DISK_TABLES	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	CREATED_TMP_TABLES	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SELECT_FULL_JOIN	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SELECT_FULL_RANGE_JOIN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SELECT_RANGE	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SELECT_RANGE_CHECK	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SELECT_SCAN	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SORT_MERGE_PASSES	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SORT_RANGE	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SORT_ROWS	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	SORT_SCAN	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	NO_INDEX_USED	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	NO_GOOD_INDEX_USED	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	NESTING_EVENT_ID	39	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history	NESTING_EVENT_TYPE	40	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_statements_history	NESTING_EVENT_LEVEL	41	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SQL_TEXT	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_history_long	DIGEST	11	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	DIGEST_TEXT	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_history_long	CURRENT_SCHEMA	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	OBJECT_TYPE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	OBJECT_SCHEMA	15	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	OBJECT_NAME	16	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	OBJECT_INSTANCE_BEGIN	17	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	MYSQL_ERRNO	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	RETURNED_SQLSTATE	19	NULL	YES	varchar	5	15	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	MESSAGE_TEXT	20	NULL	YES	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_history_long	ERRORS	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	WARNINGS	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	ROWS_AFFECTED	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	ROWS_SENT	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	ROWS_EXAMINED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	CREATED_TMP_DISK_TABLES	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	CREATED_TMP_TABLES	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SELECT_FULL_JOIN	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SELECT_FULL_RANGE_JOIN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SELECT_RANGE	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SELECT_RANGE_CHECK	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SELECT_SCAN	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SORT_MERGE_PASSES	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SORT_RANGE	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SORT_ROWS	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	SORT_SCAN	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	NO_INDEX_USED	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	NO_GOOD_INDEX_USED	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	NESTING_EVENT_ID	39	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_history_long	NESTING_EVENT_TYPE	40	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_statements_history_long	NESTING_EVENT_LEVEL	41	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_ERRORS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_WARNINGS	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_ROWS_AFFECTED	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_ROWS_SENT	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_ROWS_EXAMINED	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_CREATED_TMP_DISK_TABLES	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_CREATED_TMP_TABLES	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SELECT_FULL_JOIN	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SELECT_FULL_RANGE_JOIN	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SELECT_RANGE	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SELECT_RANGE_CHECK	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SELECT_SCAN	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SORT_MERGE_PASSES	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SORT_RANGE	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SORT_ROWS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_SORT_SCAN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_NO_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_account_by_event_name	SUM_NO_GOOD_INDEX_USED	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SCHEMA_NAME	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	DIGEST	2	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	DIGEST_TEXT	3	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_ERRORS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_WARNINGS	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_ROWS_AFFECTED	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_ROWS_SENT	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_ROWS_EXAMINED	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_CREATED_TMP_DISK_TABLES	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_CREATED_TMP_TABLES	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SELECT_FULL_JOIN	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SELECT_FULL_RANGE_JOIN	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SELECT_RANGE	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SELECT_RANGE_CHECK	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SELECT_SCAN	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SORT_MERGE_PASSES	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SORT_RANGE	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SORT_ROWS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_SORT_SCAN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_NO_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	SUM_NO_GOOD_INDEX_USED	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	FIRST_SEEN	28	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_digest	LAST_SEEN	29	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_LOCK_TIME	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_ERRORS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_WARNINGS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_ROWS_AFFECTED	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_ROWS_SENT	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_ROWS_EXAMINED	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_CREATED_TMP_DISK_TABLES	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_CREATED_TMP_TABLES	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SELECT_FULL_JOIN	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SELECT_FULL_RANGE_JOIN	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SELECT_RANGE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SELECT_RANGE_CHECK	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SELECT_SCAN	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SORT_MERGE_PASSES	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SORT_RANGE	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SORT_ROWS	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_SORT_SCAN	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_NO_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_host_by_event_name	SUM_NO_GOOD_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	OBJECT_TYPE	1	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER')			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	OBJECT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	OBJECT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	COUNT_STATEMENTS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_STATEMENTS_WAIT	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	MIN_STATEMENTS_WAIT	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	AVG_STATEMENTS_WAIT	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	MAX_STATEMENTS_WAIT	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_LOCK_TIME	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_ERRORS	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_WARNINGS	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_ROWS_AFFECTED	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_ROWS_SENT	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_ROWS_EXAMINED	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_CREATED_TMP_DISK_TABLES	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_CREATED_TMP_TABLES	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SELECT_FULL_JOIN	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SELECT_FULL_RANGE_JOIN	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SELECT_RANGE	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SELECT_RANGE_CHECK	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SELECT_SCAN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SORT_MERGE_PASSES	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SORT_RANGE	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SORT_ROWS	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_SORT_SCAN	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_NO_INDEX_USED	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_program	SUM_NO_GOOD_INDEX_USED	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_LOCK_TIME	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_ERRORS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_WARNINGS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_ROWS_AFFECTED	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_ROWS_SENT	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_ROWS_EXAMINED	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_CREATED_TMP_DISK_TABLES	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_CREATED_TMP_TABLES	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SELECT_FULL_JOIN	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SELECT_FULL_RANGE_JOIN	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SELECT_RANGE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SELECT_RANGE_CHECK	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SELECT_SCAN	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SORT_MERGE_PASSES	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SORT_RANGE	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SORT_ROWS	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_SORT_SCAN	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_NO_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_thread_by_event_name	SUM_NO_GOOD_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_LOCK_TIME	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_ERRORS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_WARNINGS	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_ROWS_AFFECTED	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_ROWS_SENT	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_ROWS_EXAMINED	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_CREATED_TMP_DISK_TABLES	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_CREATED_TMP_TABLES	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SELECT_FULL_JOIN	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SELECT_FULL_RANGE_JOIN	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SELECT_RANGE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SELECT_RANGE_CHECK	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SELECT_SCAN	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SORT_MERGE_PASSES	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SORT_RANGE	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SORT_ROWS	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_SORT_SCAN	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_NO_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_by_user_by_event_name	SUM_NO_GOOD_INDEX_USED	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_LOCK_TIME	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_ERRORS	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_WARNINGS	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_ROWS_AFFECTED	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_ROWS_SENT	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_ROWS_EXAMINED	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_CREATED_TMP_DISK_TABLES	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_CREATED_TMP_TABLES	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SELECT_FULL_JOIN	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SELECT_FULL_RANGE_JOIN	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SELECT_RANGE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SELECT_RANGE_CHECK	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SELECT_SCAN	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SORT_MERGE_PASSES	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SORT_RANGE	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SORT_ROWS	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_SORT_SCAN	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_NO_INDEX_USED	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_statements_summary_global_by_event_name	SUM_NO_GOOD_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_current	STATE	5	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ACTIVE','COMMITTED','ROLLED BACK')			select,insert,update,references		
-def	performance_schema	events_transactions_current	TRX_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	GTID	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_current	XID_FORMAT_ID	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_transactions_current	XID_GTRID	9	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		
-def	performance_schema	events_transactions_current	XID_BQUAL	10	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		
-def	performance_schema	events_transactions_current	XA_STATE	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_current	SOURCE	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_current	TIMER_START	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	TIMER_END	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	TIMER_WAIT	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	ACCESS_MODE	16	NULL	YES	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('READ ONLY','READ WRITE')			select,insert,update,references		
-def	performance_schema	events_transactions_current	ISOLATION_LEVEL	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_current	AUTOCOMMIT	18	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	events_transactions_current	NUMBER_OF_SAVEPOINTS	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	20	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	NUMBER_OF_RELEASE_SAVEPOINT	21	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	OBJECT_INSTANCE_BEGIN	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	NESTING_EVENT_ID	23	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_current	NESTING_EVENT_TYPE	24	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_transactions_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_history	STATE	5	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ACTIVE','COMMITTED','ROLLED BACK')			select,insert,update,references		
-def	performance_schema	events_transactions_history	TRX_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	GTID	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history	XID_FORMAT_ID	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_transactions_history	XID_GTRID	9	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		
-def	performance_schema	events_transactions_history	XID_BQUAL	10	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		
-def	performance_schema	events_transactions_history	XA_STATE	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history	SOURCE	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history	TIMER_START	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	TIMER_END	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	TIMER_WAIT	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	ACCESS_MODE	16	NULL	YES	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('READ ONLY','READ WRITE')			select,insert,update,references		
-def	performance_schema	events_transactions_history	ISOLATION_LEVEL	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history	AUTOCOMMIT	18	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	events_transactions_history	NUMBER_OF_SAVEPOINTS	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	20	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	NUMBER_OF_RELEASE_SAVEPOINT	21	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	OBJECT_INSTANCE_BEGIN	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	NESTING_EVENT_ID	23	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history	NESTING_EVENT_TYPE	24	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	STATE	5	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ACTIVE','COMMITTED','ROLLED BACK')			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	TRX_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	GTID	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	XID_FORMAT_ID	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	XID_GTRID	9	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	XID_BQUAL	10	NULL	YES	varchar	130	390	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(130)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	XA_STATE	11	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	SOURCE	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	TIMER_START	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	TIMER_END	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	TIMER_WAIT	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	ACCESS_MODE	16	NULL	YES	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('READ ONLY','READ WRITE')			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	ISOLATION_LEVEL	17	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	AUTOCOMMIT	18	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	NUMBER_OF_SAVEPOINTS	19	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	20	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	NUMBER_OF_RELEASE_SAVEPOINT	21	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	OBJECT_INSTANCE_BEGIN	22	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	NESTING_EVENT_ID	23	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_history_long	NESTING_EVENT_TYPE	24	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	COUNT_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	SUM_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	MIN_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	AVG_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	MAX_TIMER_READ_WRITE	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	COUNT_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	SUM_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	MIN_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	AVG_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_account_by_event_name	MAX_TIMER_READ_ONLY	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	COUNT_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	SUM_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	MIN_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	AVG_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	MAX_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	COUNT_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	SUM_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	MIN_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	AVG_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_host_by_event_name	MAX_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	COUNT_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	SUM_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	MIN_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	AVG_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	MAX_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	COUNT_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	SUM_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	MIN_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	AVG_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_thread_by_event_name	MAX_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	COUNT_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	SUM_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	MIN_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	AVG_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	MAX_TIMER_READ_WRITE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	COUNT_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	SUM_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	MIN_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	AVG_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_by_user_by_event_name	MAX_TIMER_READ_ONLY	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	COUNT_READ_WRITE	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	SUM_TIMER_READ_WRITE	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	MIN_TIMER_READ_WRITE	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	AVG_TIMER_READ_WRITE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	MAX_TIMER_READ_WRITE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	COUNT_READ_ONLY	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	SUM_TIMER_READ_ONLY	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	MIN_TIMER_READ_ONLY	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	AVG_TIMER_READ_ONLY	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_transactions_summary_global_by_event_name	MAX_TIMER_READ_ONLY	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_current	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	SPINS	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	OBJECT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_current	OBJECT_NAME	11	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	events_waits_current	INDEX_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_current	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_current	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_current	NESTING_EVENT_TYPE	16	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_waits_current	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_waits_current	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	events_waits_current	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_history	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	SPINS	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	OBJECT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history	OBJECT_NAME	11	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	events_waits_history	INDEX_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history	NESTING_EVENT_TYPE	16	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_waits_history	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_waits_history	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	events_waits_history	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	SPINS	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	OBJECT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	OBJECT_NAME	11	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	INDEX_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_history_long	NESTING_EVENT_TYPE	16	NULL	YES	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('TRANSACTION','STATEMENT','STAGE','WAIT')			select,insert,update,references		
-def	performance_schema	events_waits_history_long	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	events_waits_history_long	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_account_by_event_name	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_host_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_instance	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_thread_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_by_user_by_event_name	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	events_waits_summary_global_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_global_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_global_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_global_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	events_waits_summary_global_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_instances	FILE_NAME	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	file_instances	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	file_instances	OPEN_COUNT	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	COUNT_READ	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	SUM_TIMER_READ	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MIN_TIMER_READ	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	AVG_TIMER_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MAX_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	SUM_NUMBER_OF_BYTES_READ	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	COUNT_WRITE	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	SUM_TIMER_WRITE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MIN_TIMER_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	AVG_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MAX_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	SUM_NUMBER_OF_BYTES_WRITE	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	COUNT_MISC	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	SUM_TIMER_MISC	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MIN_TIMER_MISC	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	AVG_TIMER_MISC	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_event_name	MAX_TIMER_MISC	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	FILE_NAME	1	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	OBJECT_INSTANCE_BEGIN	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	COUNT_READ	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	SUM_TIMER_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MIN_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	AVG_TIMER_READ	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MAX_TIMER_READ	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	SUM_NUMBER_OF_BYTES_READ	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	COUNT_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	SUM_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MIN_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	AVG_TIMER_WRITE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MAX_TIMER_WRITE	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	SUM_NUMBER_OF_BYTES_WRITE	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	COUNT_MISC	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	SUM_TIMER_MISC	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MIN_TIMER_MISC	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	AVG_TIMER_MISC	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	file_summary_by_instance	MAX_TIMER_MISC	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	global_status	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	global_status	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	global_variables	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	global_variables	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	hosts	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	hosts	CURRENT_CONNECTIONS	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	hosts	TOTAL_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	IP	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	host_cache	HOST	2	NULL	YES	varchar	255	765	NULL	NULL	NULL	utf8	utf8_bin	varchar(255)			select,insert,update,references		
-def	performance_schema	host_cache	HOST_VALIDATED	3	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	host_cache	SUM_CONNECT_ERRORS	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_HOST_BLOCKED_ERRORS	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_NAMEINFO_TRANSIENT_ERRORS	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_NAMEINFO_PERMANENT_ERRORS	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_FORMAT_ERRORS	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_ADDRINFO_TRANSIENT_ERRORS	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_ADDRINFO_PERMANENT_ERRORS	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_FCRDNS_ERRORS	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_HOST_ACL_ERRORS	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_NO_AUTH_PLUGIN_ERRORS	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_AUTH_PLUGIN_ERRORS	14	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_HANDSHAKE_ERRORS	15	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_PROXY_USER_ERRORS	16	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_PROXY_USER_ACL_ERRORS	17	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_AUTHENTICATION_ERRORS	18	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_SSL_ERRORS	19	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTIONS_ERRORS	20	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_MAX_USER_CONNECTIONS_PER_HOUR_ERRORS	21	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_DEFAULT_DATABASE_ERRORS	22	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_INIT_CONNECT_ERRORS	23	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_LOCAL_ERRORS	24	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	COUNT_UNKNOWN_ERRORS	25	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	host_cache	FIRST_SEEN	26	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	host_cache	LAST_SEEN	27	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	host_cache	FIRST_ERROR_SEEN	28	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	host_cache	LAST_ERROR_SEEN	29	0000-00-00 00:00:00	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	COUNT_ALLOC	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	COUNT_FREE	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	SUM_NUMBER_OF_BYTES_FREE	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	LOW_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	CURRENT_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	HIGH_COUNT_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	LOW_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_account_by_event_name	HIGH_NUMBER_OF_BYTES_USED	13	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	COUNT_ALLOC	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	COUNT_FREE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	SUM_NUMBER_OF_BYTES_FREE	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	LOW_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	CURRENT_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	HIGH_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	LOW_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_host_by_event_name	HIGH_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	COUNT_ALLOC	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	COUNT_FREE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	SUM_NUMBER_OF_BYTES_FREE	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	LOW_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	CURRENT_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	HIGH_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	LOW_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_thread_by_event_name	HIGH_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	EVENT_NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	COUNT_ALLOC	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	COUNT_FREE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	SUM_NUMBER_OF_BYTES_FREE	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	LOW_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	CURRENT_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	HIGH_COUNT_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	LOW_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_by_user_by_event_name	HIGH_NUMBER_OF_BYTES_USED	12	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	COUNT_ALLOC	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	COUNT_FREE	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	SUM_NUMBER_OF_BYTES_ALLOC	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	SUM_NUMBER_OF_BYTES_FREE	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	LOW_COUNT_USED	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	CURRENT_COUNT_USED	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	HIGH_COUNT_USED	8	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	LOW_NUMBER_OF_BYTES_USED	9	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	CURRENT_NUMBER_OF_BYTES_USED	10	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	memory_summary_global_by_event_name	HIGH_NUMBER_OF_BYTES_USED	11	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	metadata_locks	OBJECT_TYPE	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	metadata_locks	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	metadata_locks	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	metadata_locks	OBJECT_INSTANCE_BEGIN	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	metadata_locks	LOCK_TYPE	5	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	metadata_locks	LOCK_DURATION	6	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	metadata_locks	LOCK_STATUS	7	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	metadata_locks	SOURCE	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	metadata_locks	OWNER_THREAD_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	metadata_locks	OWNER_EVENT_ID	10	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	mutex_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	mutex_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	mutex_instances	LOCKED_BY_THREAD_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	OBJECT_TYPE	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	objects_summary_global_by_type	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	performance_timers	TIMER_NAME	1	NULL	NO	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK')			select,insert,update,references		
-def	performance_schema	performance_timers	TIMER_FREQUENCY	2	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	performance_timers	TIMER_RESOLUTION	3	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	performance_timers	TIMER_OVERHEAD	4	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	OBJECT_INSTANCE_BEGIN	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	STATEMENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	STATEMENT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SQL_TEXT	4	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	OWNER_THREAD_ID	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	OWNER_EVENT_ID	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	OWNER_OBJECT_TYPE	7	NULL	YES	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER')			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	OWNER_OBJECT_SCHEMA	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	OWNER_OBJECT_NAME	9	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	TIMER_PREPARE	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	COUNT_REPREPARE	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	COUNT_EXECUTE	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_TIMER_EXECUTE	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	MIN_TIMER_EXECUTE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	AVG_TIMER_EXECUTE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	MAX_TIMER_EXECUTE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_LOCK_TIME	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_ERRORS	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_WARNINGS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_ROWS_AFFECTED	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_ROWS_SENT	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_ROWS_EXAMINED	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_CREATED_TMP_DISK_TABLES	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_CREATED_TMP_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SELECT_FULL_JOIN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SELECT_FULL_RANGE_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SELECT_RANGE	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SELECT_RANGE_CHECK	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SELECT_SCAN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SORT_MERGE_PASSES	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SORT_RANGE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SORT_ROWS	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_SORT_SCAN	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_NO_INDEX_USED	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	prepared_statements_instances	SUM_NO_GOOD_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_applier_configuration	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_applier_configuration	DESIRED_DELAY	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_applier_status	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_applier_status	SERVICE_STATE	2	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ON','OFF')			select,insert,update,references		
-def	performance_schema	replication_applier_status	REMAINING_DELAY	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	replication_applier_status	COUNT_TRANSACTIONS_RETRIES	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_coordinator	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_coordinator	THREAD_ID	2	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_coordinator	SERVICE_STATE	3	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ON','OFF')			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_coordinator	LAST_ERROR_NUMBER	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_coordinator	LAST_ERROR_MESSAGE	5	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_coordinator	LAST_ERROR_TIMESTAMP	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	WORKER_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	THREAD_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	SERVICE_STATE	4	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ON','OFF')			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	LAST_SEEN_TRANSACTION	5	NULL	NO	char	57	171	NULL	NULL	NULL	utf8	utf8_general_ci	char(57)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	LAST_ERROR_NUMBER	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	LAST_ERROR_MESSAGE	7	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	replication_applier_status_by_worker	LAST_ERROR_TIMESTAMP	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references		
-def	performance_schema	replication_connection_configuration	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	HOST	2	NULL	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	PORT	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	USER	4	NULL	NO	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	NETWORK_INTERFACE	5	NULL	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	AUTO_POSITION	6	NULL	NO	enum	1	3	NULL	NULL	NULL	utf8	utf8_general_ci	enum('1','0')			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_ALLOWED	7	NULL	NO	enum	7	21	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO','IGNORED')			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_CA_FILE	8	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_CA_PATH	9	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_CERTIFICATE	10	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_CIPHER	11	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_KEY	12	NULL	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_VERIFY_SERVER_CERTIFICATE	13	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_CRL_FILE	14	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	SSL_CRL_PATH	15	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	CONNECTION_RETRY_INTERVAL	16	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	CONNECTION_RETRY_COUNT	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_connection_configuration	HEARTBEAT_INTERVAL	18	NULL	NO	double	NULL	NULL	10	3	NULL	NULL	NULL	double(10,3) unsigned			select,insert,update,references	Number of seconds after which a heartbeat will be sent .	
-def	performance_schema	replication_connection_configuration	TLS_VERSION	19	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		
-def	performance_schema	replication_connection_status	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_connection_status	GROUP_NAME	2	NULL	NO	char	36	108	NULL	NULL	NULL	utf8	utf8_bin	char(36)			select,insert,update,references		
-def	performance_schema	replication_connection_status	SOURCE_UUID	3	NULL	NO	char	36	108	NULL	NULL	NULL	utf8	utf8_bin	char(36)			select,insert,update,references		
-def	performance_schema	replication_connection_status	THREAD_ID	4	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_connection_status	SERVICE_STATE	5	NULL	NO	enum	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	enum('ON','OFF','CONNECTING')			select,insert,update,references		
-def	performance_schema	replication_connection_status	COUNT_RECEIVED_HEARTBEATS	6	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_connection_status	LAST_HEARTBEAT_TIMESTAMP	7	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	Shows when the most recent heartbeat signal was received.	
-def	performance_schema	replication_connection_status	RECEIVED_TRANSACTION_SET	8	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	replication_connection_status	LAST_ERROR_NUMBER	9	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_connection_status	LAST_ERROR_MESSAGE	10	NULL	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	replication_connection_status	LAST_ERROR_TIMESTAMP	11	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references		
-def	performance_schema	replication_group_members	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_group_members	MEMBER_ID	2	NULL	NO	char	36	108	NULL	NULL	NULL	utf8	utf8_bin	char(36)			select,insert,update,references		
-def	performance_schema	replication_group_members	MEMBER_HOST	3	NULL	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	replication_group_members	MEMBER_PORT	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	replication_group_members	MEMBER_STATE	5	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	CHANNEL_NAME	1	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	VIEW_ID	2	NULL	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	MEMBER_ID	3	NULL	NO	char	36	108	NULL	NULL	NULL	utf8	utf8_bin	char(36)			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	COUNT_TRANSACTIONS_IN_QUEUE	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	COUNT_TRANSACTIONS_CHECKED	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	COUNT_CONFLICTS_DETECTED	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	COUNT_TRANSACTIONS_ROWS_VALIDATING	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	TRANSACTIONS_COMMITTED_ALL_MEMBERS	8	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	replication_group_member_stats	LAST_CONFLICT_FREE_TRANSACTION	9	NULL	NO	text	65535	65535	NULL	NULL	NULL	utf8	utf8_general_ci	text			select,insert,update,references		
-def	performance_schema	rwlock_instances	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	rwlock_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	rwlock_instances	WRITE_LOCKED_BY_THREAD_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	rwlock_instances	READ_LOCKED_BY_COUNT	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	performance_schema	session_account_connect_attrs	PROCESSLIST_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	session_account_connect_attrs	ATTR_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_bin	varchar(32)			select,insert,update,references		
-def	performance_schema	session_account_connect_attrs	ATTR_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_bin	varchar(1024)			select,insert,update,references		
-def	performance_schema	session_account_connect_attrs	ORDINAL_POSITION	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	session_connect_attrs	PROCESSLIST_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	session_connect_attrs	ATTR_NAME	2	NULL	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_bin	varchar(32)			select,insert,update,references		
-def	performance_schema	session_connect_attrs	ATTR_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_bin	varchar(1024)			select,insert,update,references		
-def	performance_schema	session_connect_attrs	ORDINAL_POSITION	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	session_status	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	session_status	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	session_variables	VARIABLE_NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	session_variables	VARIABLE_VALUE	2	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	setup_actors	HOST	1	%	NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	setup_actors	USER	2	%	NO	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	setup_actors	ROLE	3	%	NO	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references		
-def	performance_schema	setup_actors	ENABLED	4	YES	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_actors	HISTORY	5	YES	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_consumers	NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	setup_consumers	ENABLED	2	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_instruments	NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	setup_instruments	ENABLED	2	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_instruments	TIMED	3	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_objects	OBJECT_TYPE	1	TABLE	NO	enum	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER')			select,insert,update,references		
-def	performance_schema	setup_objects	OBJECT_SCHEMA	2	%	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	setup_objects	OBJECT_NAME	3	%	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	setup_objects	ENABLED	4	YES	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_objects	TIMED	5	YES	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	setup_timers	NAME	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	setup_timers	TIMER_NAME	2	NULL	NO	enum	11	33	NULL	NULL	NULL	utf8	utf8_general_ci	enum('CYCLE','NANOSECOND','MICROSECOND','MILLISECOND','TICK')			select,insert,update,references		
-def	performance_schema	socket_instances	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	socket_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_instances	THREAD_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_instances	SOCKET_ID	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	socket_instances	IP	5	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	socket_instances	PORT	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(11)			select,insert,update,references		
-def	performance_schema	socket_instances	STATE	7	NULL	NO	enum	6	18	NULL	NULL	NULL	utf8	utf8_general_ci	enum('IDLE','ACTIVE')			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	COUNT_STAR	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	SUM_TIMER_WAIT	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MIN_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	AVG_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	COUNT_READ	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	SUM_TIMER_READ	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MIN_TIMER_READ	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	AVG_TIMER_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MAX_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	SUM_NUMBER_OF_BYTES_READ	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	COUNT_WRITE	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	SUM_TIMER_WRITE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MIN_TIMER_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	AVG_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MAX_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	SUM_NUMBER_OF_BYTES_WRITE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	COUNT_MISC	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	SUM_TIMER_MISC	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MIN_TIMER_MISC	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	AVG_TIMER_MISC	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_event_name	MAX_TIMER_MISC	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	EVENT_NAME	1	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	COUNT_STAR	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	SUM_TIMER_WAIT	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MIN_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	AVG_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MAX_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	COUNT_READ	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	SUM_TIMER_READ	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MIN_TIMER_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	AVG_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MAX_TIMER_READ	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	SUM_NUMBER_OF_BYTES_READ	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	COUNT_WRITE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	SUM_TIMER_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MIN_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	AVG_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MAX_TIMER_WRITE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	SUM_NUMBER_OF_BYTES_WRITE	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	COUNT_MISC	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	SUM_TIMER_MISC	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MIN_TIMER_MISC	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	AVG_TIMER_MISC	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	socket_summary_by_instance	MAX_TIMER_MISC	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	status_by_account	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	status_by_account	HOST	2	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	status_by_account	VARIABLE_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	status_by_account	VARIABLE_VALUE	4	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	status_by_host	HOST	1	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references		
-def	performance_schema	status_by_host	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	status_by_host	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	status_by_thread	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	status_by_thread	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	status_by_thread	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	status_by_user	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	status_by_user	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	status_by_user	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
-def	performance_schema	table_handles	OBJECT_TYPE	1	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_handles	OBJECT_SCHEMA	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_handles	OBJECT_NAME	3	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_handles	OBJECT_INSTANCE_BEGIN	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_handles	OWNER_THREAD_ID	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_handles	OWNER_EVENT_ID	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_handles	INTERNAL_LOCK	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_handles	EXTERNAL_LOCK	8	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	OBJECT_TYPE	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	INDEX_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_STAR	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_WAIT	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_READ	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_READ	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_READ	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_WRITE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_WRITE	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_FETCH	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_FETCH	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_FETCH	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_FETCH	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_FETCH	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_INSERT	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_INSERT	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_INSERT	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_INSERT	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_INSERT	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_UPDATE	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_UPDATE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_UPDATE	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_UPDATE	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_UPDATE	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	COUNT_DELETE	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	SUM_TIMER_DELETE	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MIN_TIMER_DELETE	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	AVG_TIMER_DELETE	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_index_usage	MAX_TIMER_DELETE	39	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	OBJECT_TYPE	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_READ	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_READ	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_READ	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_WRITE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_WRITE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_FETCH	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_FETCH	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_FETCH	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_FETCH	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_FETCH	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_INSERT	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_INSERT	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_INSERT	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_INSERT	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_INSERT	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_UPDATE	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_UPDATE	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_UPDATE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_UPDATE	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_UPDATE	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	COUNT_DELETE	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	SUM_TIMER_DELETE	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MIN_TIMER_DELETE	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	AVG_TIMER_DELETE	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_io_waits_summary_by_table	MAX_TIMER_DELETE	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	OBJECT_TYPE	1	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	OBJECT_SCHEMA	2	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	OBJECT_NAME	3	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_STAR	4	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WAIT	5	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WAIT	7	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WAIT	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_READ	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_READ	10	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_READ	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_READ	12	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_READ	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_WRITE	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WRITE	15	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WRITE	16	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WRITE	17	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WRITE	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_READ_NORMAL	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_READ_NORMAL	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_READ_NORMAL	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_READ_NORMAL	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_READ_NORMAL	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_READ_WITH_SHARED_LOCKS	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_READ_WITH_SHARED_LOCKS	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_READ_WITH_SHARED_LOCKS	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_READ_WITH_SHARED_LOCKS	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_READ_WITH_SHARED_LOCKS	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_READ_HIGH_PRIORITY	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_READ_HIGH_PRIORITY	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_READ_HIGH_PRIORITY	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_READ_HIGH_PRIORITY	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_READ_HIGH_PRIORITY	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_READ_NO_INSERT	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_READ_NO_INSERT	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_READ_NO_INSERT	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_READ_NO_INSERT	37	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_READ_NO_INSERT	38	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_READ_EXTERNAL	39	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_READ_EXTERNAL	40	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_READ_EXTERNAL	41	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_READ_EXTERNAL	42	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_READ_EXTERNAL	43	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_WRITE_ALLOW_WRITE	44	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WRITE_ALLOW_WRITE	45	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WRITE_ALLOW_WRITE	46	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WRITE_ALLOW_WRITE	47	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WRITE_ALLOW_WRITE	48	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_WRITE_CONCURRENT_INSERT	49	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WRITE_CONCURRENT_INSERT	50	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WRITE_CONCURRENT_INSERT	51	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WRITE_CONCURRENT_INSERT	52	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WRITE_CONCURRENT_INSERT	53	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_WRITE_LOW_PRIORITY	54	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WRITE_LOW_PRIORITY	55	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WRITE_LOW_PRIORITY	56	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WRITE_LOW_PRIORITY	57	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WRITE_LOW_PRIORITY	58	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_WRITE_NORMAL	59	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WRITE_NORMAL	60	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WRITE_NORMAL	61	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WRITE_NORMAL	62	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WRITE_NORMAL	63	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	COUNT_WRITE_EXTERNAL	64	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	SUM_TIMER_WRITE_EXTERNAL	65	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MIN_TIMER_WRITE_EXTERNAL	66	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	AVG_TIMER_WRITE_EXTERNAL	67	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	table_lock_waits_summary_by_table	MAX_TIMER_WRITE_EXTERNAL	68	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	threads	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	threads	NAME	2	NULL	NO	varchar	128	384	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references		
-def	performance_schema	threads	TYPE	3	NULL	NO	varchar	10	30	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_ID	4	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_USER	5	NULL	YES	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_HOST	6	NULL	YES	varchar	60	180	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(60)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_DB	7	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_COMMAND	8	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_TIME	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_STATE	10	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	threads	PROCESSLIST_INFO	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references		
-def	performance_schema	threads	PARENT_THREAD_ID	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	threads	ROLE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	threads	INSTRUMENTED	14	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	threads	HISTORY	15	NULL	NO	enum	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references		
-def	performance_schema	threads	CONNECTION_TYPE	16	NULL	YES	varchar	16	48	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select,insert,update,references		
-def	performance_schema	threads	THREAD_OS_ID	17	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	users	USER	1	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references		
-def	performance_schema	users	CURRENT_CONNECTIONS	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	users	TOTAL_CONNECTIONS	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references		
-def	performance_schema	user_variables_by_thread	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	user_variables_by_thread	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	user_variables_by_thread	VARIABLE_VALUE	3	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	NULL	longblob			select,insert,update,references		
-def	performance_schema	variables_by_thread	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
-def	performance_schema	variables_by_thread	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		
-def	performance_schema	variables_by_thread	VARIABLE_VALUE	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references		
->>>>>>> 258e16fa2de... WIP 5.7 P_S
-select count(*) from information_schema.columns
+def	performance_schema	user_variables_by_thread	THREAD_ID	1	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		NEVER	NULL
+def	performance_schema	user_variables_by_thread	VARIABLE_NAME	2	NULL	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references		NEVER	NULL
+def	performance_schema	user_variables_by_thread	VARIABLE_VALUE	3	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	NULL	longblob			select,insert,update,references		NEVER	NULL
+select count(*) into @count_byte_columns from information_schema.columns
 where table_schema="performance_schema" and data_type = "bigint"
-   and column_name like "%number_of_bytes" into @count_byte_columns;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+   and column_name like "%number_of_bytes";
 select @count_byte_columns > 0;
 @count_byte_columns > 0
 1
-select count(*) from information_schema.columns
+select count(*) into @count_byte_signed from information_schema.columns
 where table_schema="performance_schema" and data_type="bigint"
    and column_name like "%number_of_bytes"
-   and column_type not like "%unsigned" into @count_byte_signed;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+   and column_type not like "%unsigned";
 select (@count_byte_columns - @count_byte_signed) = 0;
 (@count_byte_columns - @count_byte_signed) = 0
 1
-select count(*) from information_schema.columns
+select count(*) into @count_object_columns from information_schema.columns
 where table_schema="performance_schema" and data_type = "bigint"
-   and column_name like "%object_instance_begin" into @count_object_columns;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+   and column_name like "%object_instance_begin";
 select @count_object_columns > 0;
 @count_object_columns > 0
 1
-select count(*) from information_schema.columns
+select count(*) into @count_object_unsigned from information_schema.columns
 where table_schema="performance_schema" and data_type="bigint"
    and column_name like "%object_instance_begin"
-   and column_type like "%unsigned" into @count_object_unsigned;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+   and column_type like "%unsigned";
 select (@count_object_columns - @count_object_unsigned) = 0;
 (@count_object_columns - @count_object_unsigned) = 0
 1
diff --git a/mysql-test/suite/perfschema/r/temp_table_io.result b/mysql-test/suite/perfschema/r/temp_table_io.result
index c970301dc71..a1b16c42108 100644
--- a/mysql-test/suite/perfschema/r/temp_table_io.result
+++ b/mysql-test/suite/perfschema/r/temp_table_io.result
@@ -70,52 +70,32 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -124,17 +104,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/threads_history.result b/mysql-test/suite/perfschema/r/threads_history.result
index c848f8ac911..aaf2cd09e31 100644
--- a/mysql-test/suite/perfschema/r/threads_history.result
+++ b/mysql-test/suite/perfschema/r/threads_history.result
@@ -25,22 +25,27 @@ global_instrumentation	YES
 thread_instrumentation	YES
 statements_digest	YES
 # Switch to (con1, localhost, user1, , )
+connect  con1, localhost, user1, , ;
 update performance_schema.threads
 set INSTRUMENTED='YES', HISTORY='YES'
   where PROCESSLIST_ID = connection_id();
 # Switch to (con2, localhost, user2, , )
+connect  con2, localhost, user2, , ;
 update performance_schema.threads
 set INSTRUMENTED='YES', HISTORY='NO'
   where PROCESSLIST_ID = connection_id();
 # Switch to (con3, localhost, user3, , )
+connect  con3, localhost, user3, , ;
 update performance_schema.threads
 set INSTRUMENTED='NO', HISTORY='YES'
   where PROCESSLIST_ID = connection_id();
 # Switch to (con4, localhost, user4, , )
+connect  con4, localhost, user4, , ;
 update performance_schema.threads
 set INSTRUMENTED='NO', HISTORY='NO'
   where PROCESSLIST_ID = connection_id();
 # Switch to connection default
+connection default;
 truncate table performance_schema.events_transactions_current;
 truncate table performance_schema.events_transactions_history;
 truncate table performance_schema.events_transactions_history_long;
@@ -54,6 +59,7 @@ truncate table performance_schema.events_waits_current;
 truncate table performance_schema.events_waits_history;
 truncate table performance_schema.events_waits_history_long;
 # Switch to connection con1
+connection con1;
 XA START 'XA_CON1', 'XA_BQUAL', 12;
 select "Hi from con1";
 Hi from con1
@@ -62,6 +68,7 @@ XA END 'XA_CON1', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON1', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON1', 'XA_BQUAL', 12;
 # Switch to connection con2
+connection con2;
 XA START 'XA_CON2', 'XA_BQUAL', 12;
 select "Hi from con2";
 Hi from con2
@@ -70,6 +77,7 @@ XA END 'XA_CON2', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON2', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON2', 'XA_BQUAL', 12;
 # Switch to connection con3
+connection con3;
 XA START 'XA_CON3', 'XA_BQUAL', 12;
 select "Hi from con3";
 Hi from con3
@@ -78,6 +86,7 @@ XA END 'XA_CON3', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON3', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON3', 'XA_BQUAL', 12;
 # Switch to connection con4
+connection con4;
 XA START 'XA_CON4', 'XA_BQUAL', 12;
 select "Hi from con4";
 Hi from con4
@@ -85,6 +94,7 @@ Hi from con4
 XA END 'XA_CON4', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON4', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON4', 'XA_BQUAL', 12;
+connection default;
 "=========================== Transactions user 1"
 XID_FORMAT_ID	XID_GTRID	XID_BQUAL
 12	XA_CON1	XA_BQUAL
@@ -152,48 +162,59 @@ count(*)
 "=========================== Stages user 1"
 EVENT_NAME
 EVENT_NAME
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
-stage/sql/starting
-stage/sql/query end
-stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 EVENT_NAME
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/checking permissions
 stage/sql/Opening tables
+stage/sql/After opening tables
 stage/sql/init
-stage/sql/optimizing
-stage/sql/executing
-stage/sql/end
-stage/sql/query end
+stage/sql/Optimizing
+stage/sql/Executing
+stage/sql/End of update loop
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 "=========================== Stages user 2"
 EVENT_NAME
 count(*)
@@ -243,6 +264,7 @@ count(*)
 count(*)
 0
 # Switch to connection default, disable consumers
+connection default;
 update performance_schema.setup_consumers
 set enabled='NO' where name like "%history%";
 select * from performance_schema.setup_consumers;
@@ -275,6 +297,7 @@ truncate table performance_schema.events_waits_current;
 truncate table performance_schema.events_waits_history;
 truncate table performance_schema.events_waits_history_long;
 # Switch to connection con1
+connection con1;
 XA START 'XA_CON1', 'XA_BQUAL', 12;
 select "Hi from con1";
 Hi from con1
@@ -283,6 +306,7 @@ XA END 'XA_CON1', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON1', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON1', 'XA_BQUAL', 12;
 # Switch to connection con2
+connection con2;
 XA START 'XA_CON2', 'XA_BQUAL', 12;
 select "Hi from con2";
 Hi from con2
@@ -291,6 +315,7 @@ XA END 'XA_CON2', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON2', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON2', 'XA_BQUAL', 12;
 # Switch to connection con3
+connection con3;
 XA START 'XA_CON3', 'XA_BQUAL', 12;
 select "Hi from con3";
 Hi from con3
@@ -299,6 +324,7 @@ XA END 'XA_CON3', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON3', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON3', 'XA_BQUAL', 12;
 # Switch to connection con4
+connection con4;
 XA START 'XA_CON4', 'XA_BQUAL', 12;
 select "Hi from con4";
 Hi from con4
@@ -306,6 +332,7 @@ Hi from con4
 XA END 'XA_CON4', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON4', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON4', 'XA_BQUAL', 12;
+connection default;
 "=========================== Transactions user 1"
 XID_FORMAT_ID	XID_GTRID	XID_BQUAL
 12	XA_CON1	XA_BQUAL
@@ -417,6 +444,7 @@ count(*)
 count(*)
 0
 # Switch to connection default, enable consumers
+connection default;
 update performance_schema.setup_consumers
 set enabled='YES' where name like "%history%";
 select * from performance_schema.setup_consumers;
@@ -449,6 +477,7 @@ truncate table performance_schema.events_waits_current;
 truncate table performance_schema.events_waits_history;
 truncate table performance_schema.events_waits_history_long;
 # Switch to connection con1
+connection con1;
 XA START 'XA_CON1', 'XA_BQUAL', 12;
 select "Hi from con1";
 Hi from con1
@@ -457,6 +486,7 @@ XA END 'XA_CON1', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON1', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON1', 'XA_BQUAL', 12;
 # Switch to connection con2
+connection con2;
 XA START 'XA_CON2', 'XA_BQUAL', 12;
 select "Hi from con2";
 Hi from con2
@@ -465,6 +495,7 @@ XA END 'XA_CON2', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON2', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON2', 'XA_BQUAL', 12;
 # Switch to connection con3
+connection con3;
 XA START 'XA_CON3', 'XA_BQUAL', 12;
 select "Hi from con3";
 Hi from con3
@@ -473,6 +504,7 @@ XA END 'XA_CON3', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON3', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON3', 'XA_BQUAL', 12;
 # Switch to connection con4
+connection con4;
 XA START 'XA_CON4', 'XA_BQUAL', 12;
 select "Hi from con4";
 Hi from con4
@@ -480,6 +512,7 @@ Hi from con4
 XA END 'XA_CON4', 'XA_BQUAL', 12;
 XA PREPARE 'XA_CON4', 'XA_BQUAL', 12;
 XA COMMIT 'XA_CON4', 'XA_BQUAL', 12;
+connection default;
 "=========================== Transactions user 1"
 XID_FORMAT_ID	XID_GTRID	XID_BQUAL
 12	XA_CON1	XA_BQUAL
@@ -547,48 +580,59 @@ count(*)
 "=========================== Stages user 1"
 EVENT_NAME
 EVENT_NAME
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
-stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
-stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 EVENT_NAME
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
 stage/sql/checking permissions
 stage/sql/Opening tables
+stage/sql/After opening tables
 stage/sql/init
-stage/sql/optimizing
-stage/sql/executing
-stage/sql/end
-stage/sql/query end
+stage/sql/Optimizing
+stage/sql/Executing
+stage/sql/End of update loop
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 stage/sql/starting
-stage/sql/query end
+stage/sql/Query end
+stage/sql/Commit
 stage/sql/closing tables
-stage/sql/freeing items
-stage/sql/cleaning up
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
 "=========================== Stages user 2"
 EVENT_NAME
 count(*)
@@ -638,6 +682,7 @@ count(*)
 count(*)
 0
 # Switch to connection default
+connection default;
 revoke all privileges, grant option from user1@localhost;
 revoke all privileges, grant option from user2@localhost;
 revoke all privileges, grant option from user3@localhost;
diff --git a/mysql-test/suite/perfschema/r/threads_innodb.result b/mysql-test/suite/perfschema/r/threads_innodb.result
index 48e1932fba4..d79420f6fb5 100644
--- a/mysql-test/suite/perfschema/r/threads_innodb.result
+++ b/mysql-test/suite/perfschema/r/threads_innodb.result
@@ -5,21 +5,5 @@ FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
 GROUP BY name;
 name	type	processlist_user	processlist_host	processlist_db	processlist_command	processlist_time	processlist_state	processlist_info	parent_thread_id	role	instrumented
-<<<<<<< HEAD
 thread/innodb/page_cleaner_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
 thread/innodb/thread_pool_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-=======
-thread/innodb/buf_dump_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/dict_stats_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_ibuf_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_log_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_read_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_write_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/page_cleaner_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_error_monitor_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_lock_timeout_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_master_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_monitor_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_purge_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_worker_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
->>>>>>> 258e16fa2de... WIP 5.7 P_S
diff --git a/mysql-test/suite/perfschema/r/threads_mysql.result b/mysql-test/suite/perfschema/r/threads_mysql.result
index 90e3a215b13..31f91fc6464 100644
--- a/mysql-test/suite/perfschema/r/threads_mysql.result
+++ b/mysql-test/suite/perfschema/r/threads_mysql.result
@@ -7,16 +7,6 @@ role, instrumented
 FROM performance_schema.threads
 WHERE name LIKE 'thread/sql%'
 ORDER BY name;
-name	thread/sql/compress_gtid_table
-type	FOREGROUND
-processlist_user	NULL
-processlist_host	NULL
-processlist_db	NULL
-processlist_command	Daemon
-processlist_info	NULL
-unified_parent_thread_id	unified parent_thread_id
-role	NULL
-instrumented	YES
 name	thread/sql/main
 type	BACKGROUND
 processlist_user	NULL
@@ -54,11 +44,7 @@ processlist_info	NULL
 unified_parent_thread_id	unified parent_thread_id
 role	NULL
 instrumented	YES
-<<<<<<< HEAD
 name	thread/sql/slave_background
-=======
-name	thread/sql/thread_timer_notifier
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 type	BACKGROUND
 processlist_user	NULL
 processlist_host	NULL
@@ -127,12 +113,7 @@ WHERE t1.name LIKE 'thread/sql%'
 ORDER BY parent_thread_name, child_thread_name;
 parent_thread_name	child_thread_name
 thread/sql/event_scheduler	thread/sql/event_worker
-thread/sql/main	thread/sql/compress_gtid_table
 thread/sql/main	thread/sql/one_connection
 thread/sql/main	thread/sql/signal_handler
-<<<<<<< HEAD
 thread/sql/main	thread/sql/slave_background
-=======
-thread/sql/main	thread/sql/thread_timer_notifier
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 thread/sql/one_connection	thread/sql/event_scheduler
diff --git a/mysql-test/suite/perfschema/r/transaction.result b/mysql-test/suite/perfschema/r/transaction.result
index 3dd528f29bb..56c50d14879 100644
--- a/mysql-test/suite/perfschema/r/transaction.result
+++ b/mysql-test/suite/perfschema/r/transaction.result
@@ -1,3 +1,4 @@
+set global binlog_format=ROW;
 
 ========================================================================
 STEP 1 - SETUP
@@ -5,6 +6,7 @@ STEP 1 - SETUP
 
 # Control thread
 
+connection default;
 SET SESSION AUTOCOMMIT= 1;
 SELECT thread_id INTO @my_thread_id
 FROM performance_schema.threads
@@ -12,11 +14,14 @@ WHERE processlist_id = connection_id();
 
 # Connection 1
 
+connect con1, localhost, root,,;
 SET SESSION AUTOCOMMIT= 0;
 SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE;
+connection default;
 
 # Create test tables, one transactional and one non-transactional
 
+connection default;
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS nt1;
 CREATE TABLE t1 (s1 int, s2 varchar(64)) ENGINE=INNODB;
@@ -33,11 +38,10 @@ CALL clear_transaction_tables();
 # STEP 2 - BASIC TRANSACTION
 ========================================================================
 
+connection con1;
 SELECT @@global.tx_isolation;
 @@global.tx_isolation
 REPEATABLE-READ
-Warnings:
-Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
 SELECT @@global.autocommit;
 @@global.autocommit
 1
@@ -47,8 +51,6 @@ ROW
 SELECT @@tx_isolation;
 @@tx_isolation
 REPEATABLE-READ
-Warnings:
-Warning	1287	'@@tx_isolation' is deprecated and will be removed in a future release. Please use '@@transaction_isolation' instead
 SELECT @@autocommit;
 @@autocommit
 0
@@ -69,6 +71,7 @@ INSERT INTO t1 VALUES (102, 'ROLLED BACK');
 ROLLBACK;
 
 ## Expect 1 committed and 1 rolled back transaction
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED',   0, '', '', '', '', 'READ WRITE', 'REPEATABLE READ', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -79,6 +82,7 @@ CALL clear_transaction_tables();
 
 # STEP 2.3 - COMMIT AND CHAIN
 
+connection con1;
 START TRANSACTION;
 INSERT INTO t1 VALUES (103, 'COMMIT AND CHAIN');
 COMMIT AND CHAIN;
@@ -86,6 +90,7 @@ INSERT INTO t1 VALUES (104, 'COMMIT AND CHAIN');
 COMMIT;
 
 ## Expect 2 committed transactions
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'REPEATABLE READ', 'NO', 0, 0, 0, 2);
 ACTUAL	EXPECTED
      2	       2
@@ -96,6 +101,7 @@ CALL clear_transaction_tables();
 ========================================================================
 
 connection con1
+connection con1;
 SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 START TRANSACTION;
 INSERT INTO t1 VALUES (301, 'SERIALIZABLE');
@@ -117,6 +123,7 @@ COMMIT;
 SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
 SET binlog_format= @binlog_save;
 
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'SERIALIZABLE', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -139,6 +146,7 @@ CALL clear_transaction_tables();
 #
 
 connection con1
+connection con1;
 SET SESSION TRANSACTION READ WRITE;
 START TRANSACTION;
 INSERT INTO t1 VALUES (410, 'READ ONLY');
@@ -164,6 +172,7 @@ s1	s2
 COMMIT;
 
 ## Expect 1 read only, committed transaction in events_transactions_history
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ ONLY', 'REPEATABLE READ', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -178,6 +187,7 @@ UPDATE performance_schema.setup_instruments SET timed = 'NO' WHERE name = 'trans
 
 TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
 connection con1
+connection con1;
 START TRANSACTION;
 SELECT * FROM t1 ORDER BY s1;
 s1	s2
@@ -195,6 +205,7 @@ s1	s2
 COMMIT;
 
 SET SESSION TRANSACTION READ WRITE;
+connection default;
 
 ## Expect 1 event, 0 stats
 SELECT * FROM performance_schema.events_transactions_summary_global_by_event_name;
@@ -211,17 +222,21 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name = 'tr
 # transaction marks the start of a new transaction. Subsequent statements will
 # be part of the transaction until it is committed.
 
+connection con1;
 SET SESSION AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (501, 'IMPLICIT START');
 
 ## Expect 1 active transaction in events_transactions_current
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
+connection con1;
 INSERT INTO t1 VALUES (502, 'IMPLICIT START');
 COMMIT;
 
 ## Expect one committed transaction in events_transactions_current and history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -236,21 +251,25 @@ CALL clear_transaction_tables();
 # Transactions are implicitly ended by DDL statements, locking statements
 # and server administration commands.
 
+connection con1;
 SET SESSION AUTOCOMMIT = 0;
 INSERT INTO t1 VALUES (601, 'IMPLICIT COMMIT');
 
 ## Expect one active transaction in events_transactions_current, zero events in history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', 'NO', 0, 0, 0, 0);
 ACTUAL	EXPECTED
      0	       0
+connection con1;
 INSERT INTO t1 VALUES (602, 'IMPLICIT COMMIT');
 ## Issue a DDL statement to force a commmit
 CREATE TABLE t2 (s1 INT, s2 VARCHAR(64)) ENGINE=INNODB;
 
 ## Expect 0 active transactions, 1 committed transaction
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE',    0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 0);
 ACTUAL	EXPECTED
      0	       0
@@ -269,19 +288,23 @@ STEP 7 - XA TRANSACTIONS
 #
 # STEP 7.1 - XA START
 #
+connection con1;
 XA START 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
 
 ## Expect 1 active XA transaction, state ACTIVE
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'ACTIVE', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
 
 # STEP 7.2 - XA END
 
+connection con1;
 INSERT INTO t1 VALUES (701, 'XA');
 XA END 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
 
 ## Expect 1 active XA transaction, state IDLE
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'IDLE', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -289,9 +312,11 @@ ACTUAL	EXPECTED
 #
 # STEP 7.3 - XA PREPARE
 #
+connection con1;
 XA PREPARE 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
 
 ## Expect 1 active XA transaction, state PREPARED
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'PREPARED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -299,9 +324,11 @@ ACTUAL	EXPECTED
 #
 # STEP 7.4 - XA COMMIT
 #
+connection con1;
 XA COMMIT 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
 
 ## Expect 1 committed XA transaction, state COMMITTED in current and history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -313,18 +340,22 @@ CALL clear_transaction_tables();
 #
 # STEP 7.5 - XA ROLLBACK
 #
+connection con1;
 XA START 'XA_CON1_002';
 INSERT INTO t1 VALUES (702, 'XA');
 XA END 'XA_CON1_002';
 XA PREPARE 'XA_CON1_002';
 
 ## Expect 1 active XA transaction, state PREPARED
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, 'XA_CON1_002', '', 'PREPARED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
+connection con1;
 XA ROLLBACK 'XA_CON1_002';
 
 ## Expect 1 XA transaction, state ROLLBACK ONLY in current and history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, 'XA_CON1_002', '', 'ROLLBACK ONLY', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -337,6 +368,7 @@ THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	STATE	TRX_ID	GTID	XID_FORMAT_ID	XID_G
 #
 # STEP 7.6 - XA TRANSACTION - LONG GTRID AND BQUAL
 #
+connection con1;
 XA START   'GTRID_6789012345678901234567890123456789012345678901234567890123','BQUAL_6789012345678901234567890123456789012345678901234567890123',1234567890;
 INSERT INTO t1 VALUES (703, 'XA LONG');
 XA END     'GTRID_6789012345678901234567890123456789012345678901234567890123','BQUAL_6789012345678901234567890123456789012345678901234567890123',1234567890;
@@ -344,6 +376,7 @@ XA PREPARE 'GTRID_6789012345678901234567890123456789012345678901234567890123','B
 XA COMMIT  'GTRID_6789012345678901234567890123456789012345678901234567890123','BQUAL_6789012345678901234567890123456789012345678901234567890123',1234567890;
 
 ## Expect 1 committed XA transaction, state COMMITTED in current and history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'GTRID_6789012345678901234567890123456789012345678901234567890123', 'BQUAL_6789012345678901234567890123456789012345678901234567890123', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -354,6 +387,7 @@ CALL clear_transaction_tables();
 #
 # STEP 7.7 - XA TRANSACTION - LONG GTRID AND BINARY BQUAL
 #
+connection con1;
 XA START   'GTRID_6789012345678901234567890123456789012345678901234567890123',0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233,1234567890;
 INSERT INTO t1 VALUES (704, 'XA LONG/BINARY');
 XA END     'GTRID_6789012345678901234567890123456789012345678901234567890123',0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233,1234567890;
@@ -361,6 +395,7 @@ XA PREPARE 'GTRID_6789012345678901234567890123456789012345678901234567890123',0x
 XA COMMIT  'GTRID_6789012345678901234567890123456789012345678901234567890123',0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233,1234567890;
 
 ## Expect 1 committed XA transaction, state COMMITTED in current and history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'GTRID_6789012345678901234567890123456789012345678901234567890123', '0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -373,6 +408,9 @@ CALL clear_transaction_tables();
 # STEP 8 - TRANSACTIONAL AND NON-TRANSACTIONAL TABLES
 ========================================================================
 
+## MariaDB bug: MDEV-6012? MDEV-14436?
+set @mariadb_bug=1;
+connection con1;
 SET SESSION AUTOCOMMIT = 0;
 SELECT * FROM performance_schema.events_transactions_current ORDER BY event_id;
 THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	STATE	TRX_ID	GTID	XID_FORMAT_ID	XID_GTRID	XID_BQUAL	XA_STATE	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	ACCESS_MODE	ISOLATION_LEVEL	AUTOCOMMIT	NUMBER_OF_SAVEPOINTS	NUMBER_OF_ROLLBACK_TO_SAVEPOINT	NUMBER_OF_RELEASE_SAVEPOINT	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE
@@ -383,15 +421,18 @@ THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	STATE	TRX_ID	GTID	XID_FORMAT_ID	XID_G
 INSERT INTO nt1 VALUES (801, 'NON-TRANSACTIONAL');
 
 ## Expect 0 transactions in events_transactions_current
-CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+connection default;
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
 ACTUAL	EXPECTED
-     0	       0
+     1	       1
+connection con1;
 COMMIT;
 
 ## Expect 0 transactions in events_transactions_history
-CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+connection default;
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
 ACTUAL	EXPECTED
-     0	       0
+     1	       1
 
 #
 # STEP 8.2 - UPDATE TRANSACTIONAL AND NON-TRANSACTIONAL TABLES
@@ -399,30 +440,36 @@ ACTUAL	EXPECTED
 
 ## First non-transactional...
 
+connection con1;
 INSERT INTO nt1 VALUES (802, 'NON-TRANSACTIONAL');
 
 ## Expect 0 transactions in events_transactions_current
-CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+connection default;
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
 ACTUAL	EXPECTED
-     0	       0
+     1	       1
 
 ## Now transactional. Transaction should be started.
+connection con1;
 INSERT INTO t1 VALUES (802, 'TRANSACTIONAL');
 
 ## Expect 1 transaction in events_transactions_current
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
 
+connection con1;
 COMMIT;
 
 ## Expect 1 committed transaction in events_transactions_current and history
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
-CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1+@mariadb_bug);
 ACTUAL	EXPECTED
-     1	       1
+     2	       2
 CALL clear_transaction_tables();
 
 ========================================================================
@@ -431,11 +478,13 @@ CALL clear_transaction_tables();
 #
 # STEP 9.1 - SAVEPOINT 1
 #
+connection con1;
 START TRANSACTION;
 INSERT INTO t1 VALUES (901, 'SAVEPOINT');
 SAVEPOINT SVP001;
 
 ## Expect 1 active transaction with 1 savepoint
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 1, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -443,6 +492,7 @@ ACTUAL	EXPECTED
 #
 # STEP 9.2 - SAVEPOINTS 2 and 3
 #
+connection con1;
 INSERT INTO t1 VALUES (902, 'SAVEPOINT');
 SAVEPOINT SVP002;
 INSERT INTO t1 VALUES (903, 'SAVEPOINT');
@@ -455,9 +505,11 @@ COUNT(*)
 #
 # STEP 9.3 - ROLLBACK TO SAVEPOINT 2
 #
+connection con1;
 ROLLBACK TO SVP002;
 
 ## Expect 1 active transaction with 3 savepoints, 1 rollback to savepoint
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 3, 1, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -465,18 +517,22 @@ ACTUAL	EXPECTED
 #
 # STEP 9.4 - RELEASE SAVEPOINT 1
 #
+connection con1;
 RELEASE SAVEPOINT SVP001;
 
 ## Expect 1 active transaction with 3 savepoints, 1 rollback to savepoint, 1 release savepoint
+connection default;
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 3, 1, 1, 1);
 ACTUAL	EXPECTED
      1	       1
 #
 # STEP 9.5 - COMMIT
 #
+connection con1;
 COMMIT;
 
 ## Expect 1 committed transaction with 3 savepoints, 1 rollback to savepoint, 1 release savepoint
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 3, 1, 1, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -498,9 +554,12 @@ GTIDs are tested in transaction_gtid.test.
 # does not leave an orphaned transaction event, and that the row index to
 # events_transactions_history is reset to 0.
 
+connection con1;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1110, 'INSERT 1110');
+connection default;
 TRUNCATE performance_schema.events_transactions_current;
+connection con1;
 
 COMMIT;
 
@@ -509,6 +568,7 @@ INSERT INTO t1 VALUES (1111, 'INSERT 1111');
 COMMIT;
 
 ## Expect 1 transaction for connection 1
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', '', '', '', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -517,15 +577,18 @@ CALL clear_transaction_tables();
 #
 # STEP 11.2 - DISABLE THREAD INSTRUMENTATION
 #
+connection default;
 UPDATE performance_schema.setup_consumers
 SET enabled = 'NO'
   WHERE name = 'thread_instrumentation';
 
 TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
+connection con1;
 
 START TRANSACTION;
 INSERT INTO t1 VALUES (1120, 'INSERT 1120');
 COMMIT;
+connection default;
 
 ## Expect 1 event with non-zero summary stats
 SELECT EVENT_NAME, COUNT_STAR, SUM_TIMER_WAIT, MIN_TIMER_WAIT, AVG_TIMER_WAIT, COUNT_READ_WRITE
@@ -537,10 +600,12 @@ EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	COUNT_READ_WR
 UPDATE performance_schema.setup_instruments SET timed = 'NO' WHERE name = 'transaction';
 
 TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
+connection default;
 
 START TRANSACTION;
 INSERT INTO t1 VALUES (1121, 'INSERT 1121');
 COMMIT;
+connection default;
 
 ## Expect 1 event, 0 stats
 SELECT * FROM performance_schema.events_transactions_summary_global_by_event_name;
@@ -557,6 +622,7 @@ CALL clear_history();
 #
 # STEP 11.3 - STATEMENT ROLLBACK - AUTOCOMMIT OFF - BINLOG FORMAT 'STATEMENT'
 #
+connection con1;
 SET SESSION binlog_format = STATEMENT;
 SET SESSION AUTOCOMMIT = 0;
 
@@ -572,6 +638,7 @@ COMMIT;
 SET SESSION AUTOCOMMIT = 1;
 
 ## Expect 1 committed transaction
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', '', '', 'NO', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -582,6 +649,7 @@ CALL clear_history();
 #
 # STEP 11.4 - STATEMENT ROLLBACK - AUTOCOMMIT ON - BINLOG FORMAT 'STATEMENT'
 #
+connection con1;
 SET SESSION binlog_format = STATEMENT;
 SET SESSION AUTOCOMMIT = 1;
 
@@ -590,6 +658,7 @@ UPDATE t1, performance_schema.setup_instruments pfs
 SET t1.s1 = 1, pfs.timed = 'NO';
 
 ## Expect 1 rolled back transaction
+connection default;
 CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, '', '', '', '', '', '', 'YES', 0, 0, 0, 1);
 ACTUAL	EXPECTED
      1	       1
@@ -599,6 +668,8 @@ CALL clear_history();
 # CLEAN UP
 ========================================================================
 
+disconnect con1;
+connection default;
 DROP TABLE t1;
 DROP TABLE nt1;
 DROP PROCEDURE clear_transaction_tables;
@@ -606,3 +677,4 @@ DROP PROCEDURE clear_transaction_history;
 DROP PROCEDURE clear_statement_history;
 DROP PROCEDURE clear_history;
 DROP PROCEDURE transaction_verifier;
+set global binlog_format=default;
diff --git a/mysql-test/suite/perfschema/r/transaction_nested_events.result b/mysql-test/suite/perfschema/r/transaction_nested_events.result
index e0991240c05..62152f2c2cf 100644
--- a/mysql-test/suite/perfschema/r/transaction_nested_events.result
+++ b/mysql-test/suite/perfschema/r/transaction_nested_events.result
@@ -5,6 +5,7 @@
 
 ## Setup control thread
 
+connection default;
 SET SESSION AUTOCOMMIT= 1;
 USE test;
 DROP DATABASE IF EXISTS db;
@@ -15,11 +16,13 @@ CREATE TABLE db.t1 (s1 int, s2 varchar(64)) ENGINE=INNODB;
 CREATE TABLE db.nt1 (s1 int, s2 varchar(64)) ENGINE=MYISAM;
 
 ## Setup connection 1
+connect con1, localhost, root,,;
 USE db;
 SET SESSION AUTOCOMMIT = 1;
 SELECT thread_id INTO @my_thread_id
 FROM performance_schema.threads
 WHERE processlist_id = connection_id();
+connection default;
 
 ## Disable events from the control (default) connection
 UPDATE performance_schema.threads SET instrumented = 'NO' WHERE processlist_id = CONNECTION_ID();
@@ -39,20 +42,59 @@ CALL test.clear_history();
 #
 # STEP 2.1 - IMPLICIT
 #
+connection con1;
 INSERT INTO t1 VALUES (210, "INSERT 210");
 INSERT INTO t1 VALUES (211, "INSERT 211");
 INSERT INTO t1 VALUES (212, "INSERT 212");
 UPDATE t1 SET s1 = s1 + 1 WHERE s1 = 212;
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          8	          8	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  7	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	          2	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  1	STATEMENT         
 thread_id	          4	          4	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  3	STATEMENT         
@@ -61,6 +103,18 @@ thread_id	          8	          8	transaction	COMMITTED  	READ WRITE 	REPEATABLE
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          2	statement/sql/insert          	NULL        	               NULL	NULL              	    0	INSERT INTO t1 VALUES (210, "INSERT 210")
 thread_id	          3	          4	statement/sql/insert          	NULL        	               NULL	NULL              	    0	INSERT INTO t1 VALUES (211, "INSERT 211")
@@ -71,6 +125,26 @@ thread_id	          7	          8	statement/sql/update          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          2	statement/sql/insert     	               NULL	NULL              	INSERT INTO t1 VALUES (210, "INSERT 210")
 thread_id	          2	          2	transaction              	                  1	STATEMENT         	<transaction started>
@@ -83,31 +157,83 @@ thread_id	          8	          8	transaction              	                  7
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
 #
 # STEP 2.2 - EXPLICIT
 #
+connection con1;
 START TRANSACTION;
 INSERT INTO t1 VALUES (220, "INSERT 220"), (221, "INSERT 221");
 UPDATE t1 SET s2 = "UPDATE 221" WHERE s1 = 221;
 COMMIT;
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	          5	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  1	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	          5	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  1	STATEMENT         
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          2	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
 thread_id	          3	          3	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (220, "INSERT 220"), (221, "INSERT 221")
@@ -118,6 +244,26 @@ thread_id	          5	          5	statement/sql/commit          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          2	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
 thread_id	          2	          5	transaction              	                  1	STATEMENT         	<transaction started>
@@ -127,6 +273,7 @@ thread_id	          5	          5	statement/sql/commit     	                  2
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
@@ -136,6 +283,7 @@ DELETE FROM db.t1;
 #
 # STEP 3.1 - STORED PROCEDURE STARTED WITHIN TRANSACTION
 #
+connection con1;
 CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1;
 
 START TRANSACTION;
@@ -145,21 +293,71 @@ INSERT INTO t1 VALUES (312, "INSERT 312");
 INSERT INTO t1 VALUES (313, "INSERT 313");
 CALL tp_update();
 COMMIT;
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          3	         10	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  2	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          3	         10	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  2	STATEMENT         
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          1	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1
 thread_id	          2	          3	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
@@ -175,6 +373,26 @@ thread_id	         10	         10	statement/sql/commit          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          1	statement/sql/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1
 thread_id	          2	          3	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
@@ -189,12 +407,14 @@ thread_id	         10	         10	statement/sql/commit     	                  3
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
 #
 # STEP 3.2 - TRANSACTION STARTED WITHIN STORED PROCEDURE
 #
+connection con1;
 CREATE PROCEDURE tp_start() START TRANSACTION;
 
 CALL tp_start();
@@ -209,21 +429,71 @@ s1	s2
 323	INSERT 322
 324	INSERT 323
 COMMIT;
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          4	          9	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  3	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          4	          9	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  3	STATEMENT         
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          1	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_start() START TRANSACTION
 thread_id	          2	          4	statement/sql/call_procedure  	NULL        	               NULL	NULL              	    0	CALL tp_start()
@@ -238,6 +508,26 @@ thread_id	          9	          9	statement/sql/commit          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          1	statement/sql/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_start() START TRANSACTION
 thread_id	          2	          4	statement/sql/call_proced	               NULL	NULL              	CALL tp_start()
@@ -251,12 +541,14 @@ thread_id	          9	          9	statement/sql/commit     	                  4
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
 #
 # STEP 3.3 - TRANSACTION ENDED WITHIN STORED PROCEDURE
 #
+connection con1;
 CREATE PROCEDURE tp_rollback() ROLLBACK;
 CREATE PROCEDURE tp_commit() COMMIT;
 
@@ -281,16 +573,54 @@ SELECT * FROM t1 ORDER BY s1;
 s1	s2
 330	INSERT 330
 331	INSERT 331
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	         18	         18	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 17	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          4	          9	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  3	STATEMENT         
 thread_id	         11	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 10	STATEMENT         
@@ -299,6 +629,18 @@ thread_id	         18	         18	transaction	COMMITTED  	READ WRITE 	REPEATABLE
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          1	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_rollback() ROLLBACK
 thread_id	          2	          2	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_commit() COMMIT
@@ -319,6 +661,26 @@ thread_id	         17	         18	statement/sql/select          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          1	statement/sql/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_rollback() ROLLBACK
 thread_id	          2	          2	statement/sql/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_commit() COMMIT
@@ -341,6 +703,7 @@ thread_id	         18	         18	transaction              	                 17
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
@@ -351,6 +714,7 @@ DELETE FROM db.t1;
 #
 # STEP 4.1 - FUNCTION WITHIN A TRANSACTION
 #
+connection con1;
 CREATE FUNCTION fn_add(x INT, y INT) RETURNS INT
 BEGIN
 INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y");
@@ -358,7 +722,9 @@ RETURN x+y;
 END |
 
 ## Clear history
+connection default;
 CALL test.clear_history();
+connection con1;
 
 START TRANSACTION;
 INSERT INTO t1 VALUES (410, "INSERT 410");
@@ -380,22 +746,72 @@ s1	s2
 410	INSERT 410
 413	INSERT x
 414	INSERT y
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	         13	         13	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 12	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  1	STATEMENT         
 thread_id	         13	         13	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 12	STATEMENT         
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          2	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
 thread_id	          3	          3	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (410, "INSERT 410")
@@ -413,6 +829,26 @@ thread_id	         12	         13	statement/sql/select          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          2	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
 thread_id	          2	         11	transaction              	                  1	STATEMENT         	<transaction started>
@@ -430,9 +866,11 @@ thread_id	         13	         13	transaction              	                 12
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
+connection con1;
 
 ## Again, but this time with a rollback
 
@@ -445,22 +883,72 @@ ROLLBACK;
 
 SELECT * FROM t1 ORDER BY s1;
 s1	s2
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          8	          8	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  7	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	          6	transaction	ROLLED BACK	READ WRITE 	REPEATABLE READ 	NO  	                  1	STATEMENT         
 thread_id	          8	          8	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  7	STATEMENT         
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          2	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
 thread_id	          3	          5	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT fn_add(415, 416)
@@ -473,6 +961,26 @@ thread_id	          7	          8	statement/sql/select          	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          2	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
 thread_id	          2	          6	transaction              	                  1	STATEMENT         	<transaction started>
@@ -485,19 +993,23 @@ thread_id	          8	          8	transaction              	                  7
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
 #
 # STEP 4.2 - TRANSACTION CANNOT BE STARTED OR ENDED WITHIN FUNCTION
 #
-CREATE FUNCTION fn_err1() RETURNS VARCHAR(10) BEGIN START TRANSACTION ; RETURN invalid ; END|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+connection con1;
+CREATE FUNCTION fn_err1() RETURNS VARCHAR(10) BEGIN START TRANSACTION ; RETURN 'invalid' ; END|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 
 ## Expect 0 transactions
+connection default;
 SELECT COUNT(*) FROM performance_schema.events_transactions_history;
 COUNT(*)
 0
+connection con1;
 
 ## Expect stored function does not exist
 
@@ -505,12 +1017,14 @@ SELECT fn_err1();
 ERROR 42000: FUNCTION db.fn_err1 does not exist
 
 ## Expect 0 transactions
+connection default;
 SELECT COUNT(*) FROM performance_schema.events_transactions_history;
 COUNT(*)
 0
+connection con1;
 
-CREATE FUNCTION fn_err2() RETURNS VARCHAR(10) BEGIN COMMIT; RETURN invalid ; END|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+CREATE FUNCTION fn_err2() RETURNS VARCHAR(10) BEGIN COMMIT; RETURN 'invalid' ; END|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 
 ## Expect stored function does not exist
 
@@ -520,6 +1034,7 @@ SELECT fn_err2();
 ERROR 42000: FUNCTION db.fn_err2 does not exist
 
 ## Expect 0 transactions
+connection default;
 SELECT COUNT(*) FROM performance_schema.events_transactions_history;
 COUNT(*)
 0
@@ -533,6 +1048,7 @@ CALL test.clear_history();
 #
 # STEP 5.1 - FORCE STATEMENT ROLLBACK FROM TRIGGER
 #
+connection con1;
 ## Create a trigger to force statement rollback
 
 CREATE TRIGGER trigger_before_update BEFORE UPDATE ON t1
@@ -544,7 +1060,9 @@ END IF;
 END;|
 
 ## Clear history
+connection default;
 CALL test.clear_history();
+connection con1;
 
 ## Insert multiple rows, then update. Trigger will force rollback the
 ## UPDATE statement, but the transaction should not roll back.
@@ -584,22 +1102,72 @@ s1	s2
 COMMIT;
 
 DROP TRIGGER trigger_before_update;
+connection default;
 #========================================================================
 # Verify
 #========================================================================
+SELECT event_id into @base_tx_event_id
+from performance_schema.events_transactions_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
+where (THREAD_ID = @con1_thread_id)
+order by event_id limit 1;
+select if(@base_tx_event_id < @base_stmt_event_id,
+@base_tx_event_id - 1,
+@base_stmt_event_id - 1)
+into @base_event_id;
 EVENTS_TRANSACTIONS_CURRENT
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_current
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	         21	         21	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 20	STATEMENT         
 
 EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 11, ' ') 'EVENT_NAME ',
+RPAD(STATE, 11, ' ') 'STATE      ',
+RPAD(ACCESS_MODE, 11, ' ') ACCESS_MODE,
+RPAD(ISOLATION_LEVEL, 16, ' ') 'ISOLATION_LEVEL ',
+RPAD(AUTOCOMMIT, 4, ' ') AUTO,
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE
+FROM performance_schema.events_transactions_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME 	STATE      	ACCESS_MODE	ISOLATION_LEVEL 	AUTO	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE
 thread_id	          2	         19	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  1	STATEMENT         
 thread_id	         21	         21	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 20	STATEMENT         
 
 EVENTS_STATEMENTS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 30, ' ') 'EVENT_NAME                    ',
+RPAD(IFNULL(object_name, 'NULL'), 12, ' ') 'OBJECT_NAME ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+LPAD(NESTING_EVENT_LEVEL, 5, ' ') LEVEL,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long
+WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME                    	OBJECT_NAME 	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	LEVEL	SQL_TEXT
 thread_id	          1	          2	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
 thread_id	          3	          3	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (500, "INSERT 500")
@@ -625,6 +1193,26 @@ thread_id	         20	         21	statement/sql/drop_trigger    	NULL
 
 EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
 
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(NESTING_EVENT_ID - @base_event_id, 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+'<transaction started>' AS SQL_TXT
+FROM performance_schema.events_transactions_history_long t
+WHERE (t.thread_id = @con1_thread_id)
+UNION
+SELECT THREAD_ID,
+LPAD(EVENT_ID - @base_event_id, 11, ' ') as R_EVENT_ID,
+LPAD(END_EVENT_ID - @base_event_id, 11, ' ') as R_END_EVENT_ID,
+RPAD(EVENT_NAME, 25, ' ') 'EVENT_NAME               ',
+LPAD(IFNULL(NESTING_EVENT_ID - @base_event_id, 'NULL'), 19, ' ') as R_NESTING_EVENT_ID,
+RPAD(IFNULL(NESTING_EVENT_TYPE, 'NULL'), 18, ' ') NESTING_EVENT_TYPE,
+SQL_TEXT
+FROM performance_schema.events_statements_history_long s
+WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
+ORDER BY thread_id, r_event_id;
 THREAD_ID	R_EVENT_ID	R_END_EVENT_ID	EVENT_NAME               	R_NESTING_EVENT_ID	NESTING_EVENT_TYPE	SQL_TXT
 thread_id	          1	          2	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
 thread_id	          2	         19	transaction              	                  1	STATEMENT         	<transaction started>
@@ -650,6 +1238,7 @@ thread_id	         21	         21	transaction              	                 20
 
 ## Clear statement and transaction history
 CALL test.clear_history();
+CALL test.clear_history();
 ## Reset db.t1
 DELETE FROM db.t1;
 
@@ -657,6 +1246,9 @@ DELETE FROM db.t1;
 #=======================================================================
 # Cleanup
 #=======================================================================
+connection con1;
+disconnect con1;
+connection default;
 DROP DATABASE db;
 UPDATE performance_schema.setup_instruments SET enabled='YES', timed='YES';
 DROP PROCEDURE clear_transaction_tables;
diff --git a/mysql-test/suite/perfschema/r/trigger_table_io.result b/mysql-test/suite/perfschema/r/trigger_table_io.result
index 0ddeb1ead60..02821a481af 100644
--- a/mysql-test/suite/perfschema/r/trigger_table_io.result
+++ b/mysql-test/suite/perfschema/r/trigger_table_io.result
@@ -83,188 +83,92 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	NULL
-<<<<<<< HEAD
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-show status like 'performance_schema_%';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t1	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	update	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t2	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	delete	1
+wait/io/table/sql/handler		TABLE	test	t2	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	t1	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	t2	fetch	2
 show global status like 'performance_schema_%';
->>>>>>> merge-perfschema-5.7
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -273,17 +177,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/user_var_func.result b/mysql-test/suite/perfschema/r/user_var_func.result
index bd7ba75b9e4..82a8e7ec096 100644
--- a/mysql-test/suite/perfschema/r/user_var_func.result
+++ b/mysql-test/suite/perfschema/r/user_var_func.result
@@ -13,6 +13,7 @@ v1a	Hello
 v2a	World
 v3a	65
 v4a	NULL
+connect con1, localhost, root,,;
 set @v1b="Salut";
 set @v2b="La compagnie";
 set @v3b=12;
@@ -32,6 +33,8 @@ v3a	65
 v3b	12
 v4a	NULL
 v4b	NULL
+connection default;
+disconnect con1;
 select VARIABLE_NAME, VARIABLE_VALUE
 from performance_schema.user_variables_by_thread
 order by VARIABLE_NAME;
diff --git a/mysql-test/suite/perfschema/r/view_table_io.result b/mysql-test/suite/perfschema/r/view_table_io.result
index 01e18be21d2..f1591f46a41 100644
--- a/mysql-test/suite/perfschema/r/view_table_io.result
+++ b/mysql-test/suite/perfschema/r/view_table_io.result
@@ -77,102 +77,53 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-<<<<<<< HEAD
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	NULL
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
-=======
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	3
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	update	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	delete	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	no_index_tab	fetch	2
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
-wait/io/table/sql/handler	handler.cc:	TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	3
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	update	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	delete	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	no_index_tab	fetch	2
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
+wait/io/table/sql/handler		TABLE	test	marker	insert	1
 show global status like 'performance_schema_%';
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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_index_stat_lost	0
 Performance_schema_locker_lost	0
-<<<<<<< HEAD
-Performance_schema_mutex_instances_lost	0
-=======
 Performance_schema_memory_classes_lost	0
 Performance_schema_metadata_lock_lost	0
 Performance_schema_mutex_classes_lost	0
@@ -181,17 +132,16 @@ Performance_schema_nested_statement_lost	0
 Performance_schema_prepared_statements_lost	0
 Performance_schema_program_lost	0
 Performance_schema_rwlock_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 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
-<<<<<<< HEAD
-=======
 Performance_schema_table_lock_stat_lost	0
 Performance_schema_thread_classes_lost	0
->>>>>>> 258e16fa2de... WIP 5.7 P_S
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/t/alter_table_progress.test b/mysql-test/suite/perfschema/t/alter_table_progress.test
index 3b80d7d4743..fbaf1281a30 100644
--- a/mysql-test/suite/perfschema/t/alter_table_progress.test
+++ b/mysql-test/suite/perfschema/t/alter_table_progress.test
@@ -1,13 +1,14 @@
 # Tests for PERFORMANCE_SCHEMA
 
 --source include/not_embedded.inc
+--source include/have_innodb.inc
 --source include/have_perfschema.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 
 # Presence of the query cache changes query stages,
 # causing noise in the test output
---source include/have_query_cache_disabled.inc
+#--source include/have_query_cache_disabled.inc
 
 # Setup
 
diff --git a/mysql-test/suite/perfschema/t/bad_option.test b/mysql-test/suite/perfschema/t/bad_option.test
index a0e721070c2..5d4d49ed12c 100644
--- a/mysql-test/suite/perfschema/t/bad_option.test
+++ b/mysql-test/suite/perfschema/t/bad_option.test
@@ -16,20 +16,20 @@ let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
 --exec echo "wait" > $restart_file
 --shutdown_server 
 --source include/wait_until_disconnected.inc
---error 1
---exec $MYSQLD_CMD --loose-console --performance-schema-enabled=maybe > $error_log 2>&1
+--error 7
+--exec $MYSQLD_CMD --loose-console --skip-log-error --performance-schema-enabled=maybe > $error_log 2>&1
 # The server restart aborts
 # [ERROR] unknown variable 'performance-schema-enabled=maybe'
-let SEARCH_PATTERN= \[ERROR\] unknown variable 'performance-schema-enabled=maybe';
+let SEARCH_PATTERN= \[ERROR\].*unknown variable 'performance-schema-enabled=maybe';
 --source include/search_pattern_in_file.inc
 --echo # Server start with invalid startup option value 'performance-schema-enabled=maybe' : pass
 
 --remove_file $error_log
---error 1
---exec $MYSQLD_CMD --loose-console --performance-schema-max_=12 > $error_log 2>&1
+--error 7
+--exec $MYSQLD_CMD --loose-console --skip-log-error --performance-schema-max_=12 > $error_log 2>&1
 # The server restart aborts
 # [ERROR] unknown variable 'performance-schema-max_=12'
-let SEARCH_PATTERN= \[ERROR\] unknown variable 'performance-schema-max_=12';
+let SEARCH_PATTERN= \[ERROR\].*unknown variable 'performance-schema-max_=12';
 --source include/search_pattern_in_file.inc
 --echo # Server start with ambigous startup option 'performance-schema-max_=12' : pass
 # The important points is here:
@@ -41,19 +41,19 @@ let SEARCH_PATTERN= \[ERROR\] unknown variable 'performance-schema-max_=12';
 #    a similar reaction.
 
 --remove_file $error_log
---error 1
---exec $MYSQLD_CMD --loose-console --performance-schema-unknown_99 > $error_log 2>&1
+--error 2
+--exec $MYSQLD_CMD --loose-console --skip-log-error --performance-schema-unknown_99 > $error_log 2>&1
 # The server restart aborts
-let SEARCH_PATTERN= \[ERROR\] unknown option '--performance-schema-unknown_99';
+let SEARCH_PATTERN= \[ERROR\].*unknown option '--performance-schema-unknown_99';
 --source include/search_pattern_in_file.inc
 --echo # Server start with invalid startup option '--performance-schema-unknown_99' : pass
 
 --remove_file $error_log
 --error 1
---exec $MYSQLD_CMD --loose-console --datadir=bad_option_h_param > $error_log 2>&1
+--exec $MYSQLD_CMD --loose-console --skip-log-error --datadir=bad_option_h_param > $error_log 2>&1
 # The server restart aborts
-# [ERROR] failed to set datadir to /work/repo1/mysql-trunk2/bad_option_h_param/
-let SEARCH_PATTERN= \[ERROR\] failed to set datadir to .*bad_option_h_param;
+# [ERROR] failed to set datadir to /work/repo1/mysql-trunk2/bad_option_h_param
+let SEARCH_PATTERN= Can.t change dir to .*bad_option_h_param;
 --source include/search_pattern_in_file.inc
 --echo # Server start with invalid startup option value '--datadir=bad_option_h_param' : pass
 # The important point is here:
diff --git a/mysql-test/suite/perfschema/t/batch_table_io_func.test b/mysql-test/suite/perfschema/t/batch_table_io_func.test
index 67f98cc82d8..c35d8a06125 100644
--- a/mysql-test/suite/perfschema/t/batch_table_io_func.test
+++ b/mysql-test/suite/perfschema/t/batch_table_io_func.test
@@ -96,7 +96,7 @@ select * from t3
 # TEST 1 (join, no index)
 #
 
-explain select t1.*, t2.*, t3.*
+explain extended select t1.*, t2.*, t3.*
   from t1 join t2 using (id1) join t3 using (id2);
 
 call before_payload();
@@ -120,7 +120,7 @@ alter table t2 add index(id1);
 alter table t3 add unique index(id3);
 alter table t3 add index(id2);
 
-explain select t1.*, t2.*, t3.*
+explain extended select t1.*, t2.*, t3.*
   from t1 join t2 using (id1) join t3 using (id2);
 
 call before_payload();
diff --git a/mysql-test/suite/perfschema/t/connection_type_notwin.test b/mysql-test/suite/perfschema/t/connection_type_notwin.test
index 2a3bc2a8f0e..800fdb7ad51 100644
--- a/mysql-test/suite/perfschema/t/connection_type_notwin.test
+++ b/mysql-test/suite/perfschema/t/connection_type_notwin.test
@@ -17,7 +17,8 @@ create user 'rootssl'@'santa.claus.ipv4.example.com'
   require SSL;
 grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
 
-set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
+set @old_dbug=@@global.debug_dbug;
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 
 # Setup
 # make sure we start with a clean slate. log_tables.test says this is OK.
@@ -89,10 +90,9 @@ SET GLOBAL log_output=        @old_log_output;
 
 --horizontal_results
 
-set global debug= default;
+set global debug_dbug= @old_dbug;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';
 drop user 'rootssl'@'santa.claus.ipv4.example.com';
 
-
diff --git a/mysql-test/suite/perfschema/t/connection_type_win.test b/mysql-test/suite/perfschema/t/connection_type_win.test
index 0a9981a1bd7..fa09fc7fe57 100644
--- a/mysql-test/suite/perfschema/t/connection_type_win.test
+++ b/mysql-test/suite/perfschema/t/connection_type_win.test
@@ -17,7 +17,7 @@ create user 'rootssl'@'santa.claus.ipv4.example.com'
   require SSL;
 grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
 
-set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
+set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 
 # Setup
 # make sure we start with a clean slate. log_tables.test says this is OK.
@@ -89,7 +89,7 @@ SET GLOBAL log_output=        @old_log_output;
 
 --horizontal_results
 
-set global debug= default;
+set global debug_dbug= default;
 revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
 drop user 'root'@'santa.claus.ipv4.example.com';
 revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';
diff --git a/mysql-test/suite/perfschema/t/ddl_esms_by_program.test b/mysql-test/suite/perfschema/t/ddl_esms_by_program.test
index 0d3341b7905..ba24da5e4ba 100644
--- a/mysql-test/suite/perfschema/t/ddl_esms_by_program.test
+++ b/mysql-test/suite/perfschema/t/ddl_esms_by_program.test
@@ -1,5 +1,5 @@
 # This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
- --source include/have_myisam.inc
+#--source include/have_myisam.inc
 
 # Tests for PERFORMANCE_SCHEMA
 
diff --git a/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test b/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test
index 2aa0bc962a2..0cba4c485a5 100644
--- a/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test
+++ b/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test
@@ -1,5 +1,5 @@
 # This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
- --source include/have_myisam.inc
+#--source include/have_myisam.inc
 
 # Tests for PERFORMANCE_SCHEMA
 
diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_program.test b/mysql-test/suite/perfschema/t/dml_esms_by_program.test
index 836e5c4ab11..b80b9aa5039 100644
--- a/mysql-test/suite/perfschema/t/dml_esms_by_program.test
+++ b/mysql-test/suite/perfschema/t/dml_esms_by_program.test
@@ -1,5 +1,5 @@
 # This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
- --source include/have_myisam.inc
+#--source include/have_myisam.inc
 
 # Tests for PERFORMANCE_SCHEMA
 
diff --git a/mysql-test/suite/perfschema/t/dml_file_instances.test b/mysql-test/suite/perfschema/t/dml_file_instances.test
index 92174e222ba..ea3bf0a1917 100644
--- a/mysql-test/suite/perfschema/t/dml_file_instances.test
+++ b/mysql-test/suite/perfschema/t/dml_file_instances.test
@@ -2,6 +2,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/have_innodb.inc
 
 --disable_result_log
 select * from performance_schema.file_instances limit 1;
diff --git a/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test b/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test
index bf17c3d56c7..3c96740df77 100644
--- a/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test
+++ b/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test
@@ -1,5 +1,5 @@
 # This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
- --source include/have_myisam.inc
+#--source include/have_myisam.inc
 
 # Tests for PERFORMANCE_SCHEMA
 
diff --git a/mysql-test/suite/perfschema/t/hostcache_peer_addr-master.opt b/mysql-test/suite/perfschema/t/hostcache_peer_addr-master.opt
deleted file mode 100644
index cef79bc8585..00000000000
--- a/mysql-test/suite/perfschema/t/hostcache_peer_addr-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---force-restart
diff --git a/mysql-test/suite/perfschema/t/information_schema.test b/mysql-test/suite/perfschema/t/information_schema.test
index 127c3eb1e3c..937a1b4f61b 100644
--- a/mysql-test/suite/perfschema/t/information_schema.test
+++ b/mysql-test/suite/perfschema/t/information_schema.test
@@ -31,13 +31,15 @@ select lower(TABLE_NAME), VERSION, ROW_FORMAT
 select lower(TABLE_NAME), AVG_ROW_LENGTH
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema' and
-  lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status';
+  lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status'
+  order by table_name;
 
 --replace_column 2 table_rows 3 avg_row_len
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
   from information_schema.tables
   where TABLE_SCHEMA='performance_schema' and
-  lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status';
+  lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status'
+  order by table_name;
 
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
   from information_schema.tables
@@ -59,10 +61,10 @@ select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
   where TABLE_SCHEMA='performance_schema'
   order by table_name;
 
-# TABLESPACE_NAME does not exist in 5.4
 select lower(TABLE_NAME), CREATE_OPTIONS
   from information_schema.tables
-  where TABLE_SCHEMA='performance_schema';
+  where TABLE_SCHEMA='performance_schema'
+  order by table_name;
 
 select lower(TABLE_NAME), TABLE_COMMENT
   from information_schema.tables
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate-master.opt
index c0cc26cf9b9..cd2044483ef 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate-master.opt
@@ -1,2 +1 @@
---force-restart
 --query_cache_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt
index c0cc26cf9b9..cd2044483ef 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt
@@ -1,2 +1 @@
---force-restart
 --query_cache_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt
index 8b9dd84eb75..0cdab7054d8 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt
@@ -1,3 +1,2 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_accounts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt
index 93adbfc85db..30b8ed74c88 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt
@@ -1,4 +1,3 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_accounts_size=0
 --loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt
index d68cfa70ac3..b0629a513c0 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt
@@ -1,4 +1,3 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_accounts_size=0
 --loose-performance_schema_users_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt
index ebce116088d..89df63a3251 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt
@@ -1,4 +1,3 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_accounts_size=0
 --loose-performance_schema_users_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt
index 15ed308cf51..d630f88b87a 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt
@@ -1,3 +1,2 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt
index 26d52023ca7..0d4faa03cd1 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt
@@ -1,3 +1,2 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_users_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt
index 9244e82ac1d..2a23af9d390 100644
--- a/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt
@@ -1,4 +1,3 @@
---force-restart
 --query_cache_size=0
 --loose-performance_schema_users_size=0
 --loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test
index 6837e0ec1a9..dd8b6f6154a 100644
--- a/mysql-test/suite/perfschema/t/nesting.test
+++ b/mysql-test/suite/perfschema/t/nesting.test
@@ -1,7 +1,7 @@
 # Test to check the proper nesting of events
 
 ## To skip the test with QC enabled till BUG#14830950 is fixed.
--- source include/have_QC_Disabled.inc
+#-- source include/have_QC_Disabled.inc
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
diff --git a/mysql-test/suite/perfschema/t/no_threads-master.opt b/mysql-test/suite/perfschema/t/no_threads-master.opt
index 4d4bb34260a..eea71a77864 100644
--- a/mysql-test/suite/perfschema/t/no_threads-master.opt
+++ b/mysql-test/suite/perfschema/t/no_threads-master.opt
@@ -2,4 +2,4 @@
 --loose-performance-schema-max-thread_instances=50
 --default-storage-engine=MyISAM
 --default-tmp-storage-engine=MyISAM
---skip-innodb
+--loose-skip-innodb
diff --git a/mysql-test/suite/perfschema/t/no_threads.test b/mysql-test/suite/perfschema/t/no_threads.test
index 5cfc84995c7..3cf9a9e3126 100644
--- a/mysql-test/suite/perfschema/t/no_threads.test
+++ b/mysql-test/suite/perfschema/t/no_threads.test
@@ -1,8 +1,3 @@
-# The include statement below is a temp one for tests that are yet to
-#be ported to run with InnoDB,
-#but needs to be kept for tests that would need MyISAM in future.
- --source include/force_myisam_default.inc
-
 # Tests for PERFORMANCE_SCHEMA
 
 --source include/not_embedded.inc
diff --git a/mysql-test/suite/perfschema/t/read_only.test b/mysql-test/suite/perfschema/t/read_only.test
index 48b7354138f..05665eeb0bb 100644
--- a/mysql-test/suite/perfschema/t/read_only.test
+++ b/mysql-test/suite/perfschema/t/read_only.test
@@ -11,7 +11,6 @@
 use performance_schema;
 
 set @start_read_only= @@global.read_only;
-set @start_super_read_only= @@global.super_read_only;
 
 create user pfsuser@localhost;
 grant SELECT, UPDATE on performance_schema.* to pfsuser@localhost;
diff --git a/mysql-test/suite/perfschema/t/rpl_threads-slave.opt b/mysql-test/suite/perfschema/t/rpl_threads-slave.opt
deleted file mode 100644
index cef79bc8585..00000000000
--- a/mysql-test/suite/perfschema/t/rpl_threads-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
---force-restart
diff --git a/mysql-test/suite/perfschema/t/show_aggregate-master.opt b/mysql-test/suite/perfschema/t/show_aggregate-master.opt
deleted file mode 100644
index cef79bc8585..00000000000
--- a/mysql-test/suite/perfschema/t/show_aggregate-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---force-restart
diff --git a/mysql-test/suite/perfschema/t/show_aggregate.test b/mysql-test/suite/perfschema/t/show_aggregate.test
index b5c5d9355d7..df5a6cdf036 100644
--- a/mysql-test/suite/perfschema/t/show_aggregate.test
+++ b/mysql-test/suite/perfschema/t/show_aggregate.test
@@ -9,6 +9,7 @@
 ################################################################################
 
 --source include/have_perfschema.inc
+--source include/have_innodb.inc
 --source include/not_embedded.inc
 --source include/no_protocol.inc
 
@@ -18,9 +19,6 @@
 --echo ================================================================================
 --echo SETUP
 --echo ================================================================================
---echo # Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
-SET @@global.show_compatibility_56=OFF;
 SET @@session.sql_log_bin=OFF;
 --echo
 --echo # CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE
@@ -287,11 +285,11 @@ ORDER BY variable_name;
 --echo
 FLUSH STATUS;
 --echo
-SELECT * FROM status_by_account WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+SELECT * FROM status_by_account WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
 --echo
 SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
 --echo
-SELECT * FROM status_by_user WHERE user LIKE 'user%' AND variable_name IN ('handler_delete');
+SELECT * FROM status_by_user WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
 
 
 --echo ================================================================================
@@ -305,6 +303,3 @@ DROP USER 'user1'@localhost;
 DROP USER 'user2'@localhost;
 DROP USER 'user3'@localhost;
 --echo
---echo # Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
- 
diff --git a/mysql-test/suite/perfschema/t/show_coverage.test b/mysql-test/suite/perfschema/t/show_coverage.test
index c4b06029534..31a24de7b6e 100644
--- a/mysql-test/suite/perfschema/t/show_coverage.test
+++ b/mysql-test/suite/perfschema/t/show_coverage.test
@@ -9,13 +9,6 @@
 --source include/no_protocol.inc
 --source include/count_sessions.inc
 
-select @@global.show_compatibility_56 into @show_compatibility_56_save;
---echo
---echo ================================================================================
---echo SHOW_COMPATIBILITY_56 = ON
---echo ================================================================================
-set global show_compatibility_56 = ON;
-
 --echo
 --echo # TEST 1
 --echo # Handling of SHOW STATUS/VARIABLES ... WHERE
@@ -41,11 +34,6 @@ CREATE TABLE t0 SELECT * FROM information_schema.global_status WHERE variable_na
 DROP TABLE t0;
 
 --echo
---echo ================================================================================
---echo SHOW_COMPATIBILITY_56 = OFF
---echo ================================================================================
-set global show_compatibility_56 = OFF;
---echo
 --echo # TEST 3
 --echo # Select status and system variable tables using ORDER BY to exercise the
 --echo # rnd_pos() method
@@ -196,6 +184,3 @@ FLUSH STATUS;
 --let $assert_cond = $default_session_value = 0
 --let $assert_text = Default session value after FLUSH must remain zero
 --source include/assert.inc
-
---echo # CLEANUP
-set @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/t/show_misc.test b/mysql-test/suite/perfschema/t/show_misc.test
index 39a6b65b6b5..65241ab1c75 100644
--- a/mysql-test/suite/perfschema/t/show_misc.test
+++ b/mysql-test/suite/perfschema/t/show_misc.test
@@ -2,44 +2,12 @@
 --source include/not_embedded.inc
 --source include/no_protocol.inc
 
-select @@global.show_compatibility_56 into @show_compatibility_56_save;
-
---echo ================================================================================
---echo SHOW_COMPATIBILITY_56 = ON
---echo ================================================================================
-set global show_compatibility_56 = on;
-
-select 1;
-SHOW STATUS LIKE 'Last_query_partial_plans';
-select 2;
-SHOW STATUS LIKE 'Last_query_cost';
-
-
---echo
---echo ================================================================================
---echo SHOW_COMPATIBILITY_56 = OFF
---echo ================================================================================
-set global show_compatibility_56 = off;
-
 select 1;
 SHOW STATUS LIKE 'Last_query_partial_plans';
 select 2;
 SHOW STATUS LIKE 'Last_query_cost';
 
-
---echo ================================================================================
---echo SHOW_COMPATIBILITY_56 = ON
---echo ================================================================================
 flush status;
-set global show_compatibility_56 = on;
-SHOW STATUS LIKE 'Created_tmp_tables';
-
---echo
---echo ================================================================================
---echo SHOW_COMPATIBILITY_56 = OFF
---echo ================================================================================
-set global show_compatibility_56 = off;
-
 SHOW STATUS LIKE 'Created_tmp_tables';
 
 --echo
@@ -94,5 +62,3 @@ SELECT variable_name FROM performance_schema.variables_by_thread
 --echo ================================================================================
 --echo CLEAN UP
 --echo ================================================================================
-set @@global.show_compatibility_56 = @show_compatibility_56_save;
-
diff --git a/mysql-test/suite/perfschema/t/show_plugin-master.opt b/mysql-test/suite/perfschema/t/show_plugin-master.opt
deleted file mode 100644
index 66dd39684b2..00000000000
--- a/mysql-test/suite/perfschema/t/show_plugin-master.opt
+++ /dev/null
@@ -1,3 +0,0 @@
-$EXAMPLE_PLUGIN_OPT
-
-
diff --git a/mysql-test/suite/perfschema/t/show_plugin.test b/mysql-test/suite/perfschema/t/show_plugin.test
index 047caf71a4b..53ef699468c 100644
--- a/mysql-test/suite/perfschema/t/show_plugin.test
+++ b/mysql-test/suite/perfschema/t/show_plugin.test
@@ -23,6 +23,7 @@
 --source include/not_embedded.inc
 --source include/not_windows_embedded.inc
 --source include/have_example_plugin.inc
+--source include/have_innodb.inc
 --source include/have_debug_sync.inc
 
 --enable_connect_log
@@ -34,18 +35,11 @@
 --echo # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 --echo
---echo # Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
---echo #
---echo # SET COMPATIBILITY MODE = OFF
---echo #
-SET @@global.show_compatibility_56 = OFF;
---echo
 --echo # Verify EXAMPLE plugin is not loaded
 SELECT COUNT(*) = 0 AS "Expect 1" FROM information_schema.plugins WHERE plugin_name = "EXAMPLE";
 --echo
---echo # Create one session to force local and global system variables;
-connect(con0, localhost, root,,);
+--echo # Create one session to force local and global system variables
+--connect(con0, localhost, root,,)
 --connection default
 --echo
 --echo ================================================================================
@@ -60,8 +54,7 @@ connect(con0, localhost, root,,);
 --echo ================================================================================
 --echo 2.1 - INSTALL PLUGIN
 --echo ================================================================================
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+INSTALL PLUGIN example SONAME 'ha_example';
 
 --echo
 --echo ================================================================================
@@ -106,8 +99,7 @@ UNINSTALL PLUGIN example;
 --echo 2.6 - REINSTALL PLUGIN
 --echo ================================================================================
 --echo # Reinstall EXAMPLE plugin
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+INSTALL PLUGIN example SONAME 'ha_example';
 
 --echo
 --echo ================================================================================
@@ -147,8 +139,7 @@ UNINSTALL PLUGIN example;
 --echo ================================================================================
 --echo 3.1 - INSTALL PLUGIN
 --echo ================================================================================
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+INSTALL PLUGIN example SONAME 'ha_example';
 
 --echo
 --echo ================================================================================
@@ -165,13 +156,13 @@ SET SESSION example_double_thdvar = 300.0000;
 --echo ================================================================================
 --echo 3.3 - CONNECT 3 CLIENTS, SET LOCAL PLUGIN VARS
 --echo ================================================================================
-connect(con1, localhost, root,,);
+--connect(con1, localhost, root,,)
 SET SESSION example_double_thdvar = 300.1111;
 --echo
-connect(con2, localhost, root,,);
+--connect(con2, localhost, root,,)
 SET SESSION example_double_thdvar = 300.2222;
 --echo
-connect(con3, localhost, root,,);
+--connect(con3, localhost, root,,)
 SET SESSION example_double_thdvar = 300.3333;
 --echo
 --connection default
@@ -218,13 +209,13 @@ WHERE variable_name LIKE "example_%" ORDER BY variable_value;
 --echo ================================================================================
 --echo 3.7 - RECONNECT 3 CLIENTS, SET SESSION VARS FOR EACH
 --echo ================================================================================
-connect(con1, localhost, root,,);
+--connect(con1, localhost, root,,)
 SET SESSION example_double_thdvar = 311.1111;
 --echo
-connect(con2, localhost, root,,);
+--connect(con2, localhost, root,,)
 SET SESSION example_double_thdvar = 322.2222;
 --echo
-connect(con3, localhost, root,,);
+--connect(con3, localhost, root,,)
 SET SESSION example_double_thdvar = 333.3333;
 --echo
 --connection default
@@ -288,140 +279,6 @@ WHERE variable_name LIKE "example_%" ORDER BY variable_value;
 --echo TEST 4 - BUG#18008907: DEADLOCK WITH CHANGE_USER, SHOW VARIABLES, INSTALL PLUGIN
 --echo ================================================================================
 --echo
---disable_result_log
-DELIMITER |;
-
-CREATE PROCEDURE install_no_such_plugin()
-BEGIN
-  INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
-END|
---echo
-CREATE PROCEDURE show_vars()
-BEGIN
-  -- select on information_schema.global_variables
-  -- will fail, still need to cover execution of the code
-  -- to verify potential dead locks.
-  declare continue handler for sqlexception
-  begin
-  end;
-
-  SELECT COUNT(*) FROM information_schema.global_variables;
-  SELECT COUNT(*) FROM performance_schema.global_variables;
-END|
-
-DELIMITER ;|
---enable_result_log
-
---echo
---echo ================================================================================
---echo 4.1 - DEADLOCK SCENARIO 1:
---echo       con1 - has LOCK_system_variables_hash and waits on LOCK_plugin AND
---echo       default - has LOCK_plugin and waits on LOCK_system_variables_hash
---echo ================================================================================
-connect(con1, localhost, root,,);
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
---send call show_vars();
---connection default
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
---send call install_no_such_plugin();
---connection con1
-
---echo
---echo # Without fix, reap will hang.
---disable_warnings
---replace_column 1 #
---reap;
---enable_warnings
-SET DEBUG_SYNC='RESET';
-
---connection default
---replace_regex /(Can\'t open shared library).*$/\1/
---error ER_CANT_OPEN_LIBRARY
---reap;
---echo
-SET DEBUG_SYNC='RESET';
-
---echo
---echo ================================================================================
---echo 4.2 - DEADLOCK SCENARIO 2:
---echo       default - has LOCK_system_variables_hash, waits on LOCK_global_system_variables
---echo       con1 - has LOCK_plugin, waits on LOCK_system_variables_hash AND
---echo       con2 - has LOCK_global_system_variables, waits on LOCK_plugin
---echo ================================================================================
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
---send call show_vars();
---connection con1
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
---send call install_no_such_plugin();
-connect(con2, localhost, root,,);
-SET DEBUG_SYNC='now WAIT_FOR create_connection';
-
---echo
---echo # Without fix, deadlock situation will occur on timeout of debug_syncs in
---echo # default and con1.  Because of this, change_user operation hangs.
---echo change_user
-change_user;
---connection con1
---replace_regex /(Can\'t open shared library).*$/\1/
---error ER_CANT_OPEN_LIBRARY
---reap;
-
---echo
---connection default
---replace_column 1 #
---disable_warnings
---reap;
---enable_warnings
-
---echo
---disconnect con2
-
---echo
---echo ================================================================================
---echo 4.3 - DEADLOCK SCENARIO 3: CONCURRENT SHOW VARIABLES AND UNINSTALL PLUGIN
---echo ================================================================================
---echo #
---echo # INSTALL PLUGIN
---echo #
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
---connection con1
-
---echo
---echo # Acquiring LOCK_system_variables_hash and LOCK_plugin_delete
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
-
---send call show_vars();
-connect(con2, localhost, root,,);
-
---echo #
---echo # UNINSTALL PLUGIN
---echo #
-SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
---send UNINSTALL PLUGIN example;
---connection default
-
---echo
---echo # Uninstall will wait until SHOW VARIABLES releases LOCK_plugin_delete.
-let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
-                     WHERE INFO='UNINSTALL PLUGIN example' and
-                     STATE='System lock';
---source include/wait_condition.inc
-SET DEBUG_SYNC='now SIGNAL go';
---echo # Connect con1 - reap
---connection con1
---replace_column 1 #
---disable_warnings
---reap
---enable_warnings
---echo # Connect con2 - reap
---connection con2
---disable_warnings
---reap
---enable_warnings
-
 --echo
 --echo ================================================================================
 --echo TEST 5 - BUG#22225549 MYSQL_CHANGE_USER/MYSQL_RESET_CONNECTION + SET INNODB...
@@ -429,10 +286,6 @@ SET DEBUG_SYNC='now SIGNAL go';
 --echo          variables and deadlocks on THD::LOCK_thd_sysvar.
 --echo ================================================================================
 #
-# THD:LOCK_thd_sysvar is only used when SHOW_COMPATIBILITY_56 = OFF
-#
-SELECT @@global.show_compatibility_56;
-#
 # The deadlock occurs when plugin-defined session variables are resynced with the global
 # variables. To force a resync, change the user and update a session variable from a
 # plugin, in this case InnoDB.
@@ -459,19 +312,10 @@ select @@session.innodb_strict_mode;
 --echo ================================================================================
 --connection default
 --echo
-DROP PROCEDURE show_vars;
-DROP PROCEDURE install_no_such_plugin;
-SET DEBUG_SYNC='RESET';
 
 --echo
---disconnect con1
---disconnect con2
 --disable_connect_log
 
 --echo
---echo # Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
-
---echo
 --echo # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/perfschema/t/show_plugin_56-master.opt b/mysql-test/suite/perfschema/t/show_plugin_56-master.opt
deleted file mode 100644
index 66dd39684b2..00000000000
--- a/mysql-test/suite/perfschema/t/show_plugin_56-master.opt
+++ /dev/null
@@ -1,3 +0,0 @@
-$EXAMPLE_PLUGIN_OPT
-
-
diff --git a/mysql-test/suite/perfschema/t/show_plugin_56.test b/mysql-test/suite/perfschema/t/show_plugin_56.test
deleted file mode 100644
index fa8a0781f01..00000000000
--- a/mysql-test/suite/perfschema/t/show_plugin_56.test
+++ /dev/null
@@ -1,446 +0,0 @@
-################# suite/perfschema/t/show_plugin_56.test ##########################
-#                                                                              #
-# MySQL plugins can define their own status variables and system variables.    #
-# This test exercises SHOW STATUS, SHOW VARIABLES and the status and system    #
-# variable tables while the EXAMPLE plugin is loaded and unloaded.             #
-#                                                                              #
-# The EXAMPLE plugin defines the following system and status variables:        #
-# Global system variables:                                                     # 
-#   example_double_thdvar                                                      #
-#   example_double_var                                                         #
-#   example_enum_var                                                           #
-#   example_ulong_var                                                          #
-#                                                                              #
-# Session variables:                                                           #
-#   example_double_thdvar - Local and/or global                                #
-#                                                                              #
-# Global status:                                                               #
-#   example_func_example  - Status function                                    #
-#                                                                              #
-################################################################################
-
---source include/have_perfschema.inc
---source include/not_embedded.inc
---source include/not_windows_embedded.inc
---source include/have_example_plugin.inc
---source include/have_debug_sync.inc
-
---enable_connect_log
-
---echo
---echo ================================================================================
---echo SETUP
---echo ================================================================================
---echo # Save the initial number of concurrent sessions
---source include/count_sessions.inc
---echo
---echo # Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
---echo #
---echo # SET COMPATIBILITY MODE = ON
---echo #
-SET @@global.show_compatibility_56 = ON;
---echo
---echo # Verify EXAMPLE plugin is not loaded
-SELECT COUNT(*) = 0 AS "Expect 1" FROM information_schema.plugins WHERE plugin_name = "EXAMPLE";
---echo
---echo # Create one session to force local and global system variables;
-connect(con0, localhost, root,,);
---connection default
---echo
---echo ================================================================================
---echo TEST 1- NO PLUGIN VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
---echo
-
---echo ================================================================================
---echo TEST 2 - PLUGIN LOAD, UNLOAD, RELOAD
---echo ================================================================================
---echo ================================================================================
---echo 2.1 - INSTALL PLUGIN
---echo ================================================================================
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
-
---echo
---echo ================================================================================
---echo 2.1a - FORCE SYNC OF LOCAL AND GLOBAL SYSTEM VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
-
---disconnect con0
-
---echo
---echo ================================================================================
---echo 2.2 - SET PLUGIN VARS
---echo ================================================================================
---echo # GLOBAL
-SET GLOBAL example_ulong_var = 100;
-SET GLOBAL example_enum_var = e1;
-SET GLOBAL example_double_var = 100.9990;
-SET GLOBAL example_double_thdvar = 101.9991;
---echo # SESSION
-SET SESSION example_double_thdvar = 102.9992;
-
---echo
---echo ================================================================================
---echo 2.3 - VERIFY UPDATED PLUGIN VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
-
---echo
---echo ================================================================================
---echo 2.4 - UNINSTALL PLUGIN
---echo ================================================================================
-UNINSTALL PLUGIN example;
-
---echo
---echo ================================================================================
---echo 2.5 - VERIFY NO PLUGIN VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
-
---echo
---echo ================================================================================
---echo 2.6 - REINSTALL PLUGIN
---echo ================================================================================
---echo # Reinstall EXAMPLE plugin
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
-
---echo
---echo ================================================================================
---echo 2.7 - SET PLUGIN VARS AGAIN
---echo ================================================================================
---echo # GLOBAL
-SET GLOBAL example_ulong_var = 200;
-SET GLOBAL example_enum_var = e2;
-SET GLOBAL example_double_var = 200.8880;
-SET GLOBAL example_double_thdvar = 201.8881;
---echo # SESSION
-SET SESSION example_double_thdvar = 202.8882;
-
---echo
---echo ================================================================================
---echo 2.8 - VERIFY PLUGIN VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
-
---echo
---echo ================================================================================
---echo 2.9 - UNINSTALL PLUGIN
---echo ================================================================================
-UNINSTALL PLUGIN example;
-
---echo
---echo ================================================================================
---echo 2.10 - VERIFY NO PLUGIN VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
-
---echo
---echo ================================================================================
---echo TEST 3 - SESSION PLUGIN VARS ON MULTIPLE CONNECTIONS
---echo ================================================================================
---echo
---echo ================================================================================
---echo 3.1 - INSTALL PLUGIN
---echo ================================================================================
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
-
---echo
---echo ================================================================================
---echo 3.2 - SET GLOBAL AND DEFAULT CONNECTION VARS
---echo ================================================================================
---connection default
-SET GLOBAL example_ulong_var = 300;
-SET GLOBAL example_enum_var = e1;
-SET GLOBAL example_double_var = 301.0000;
-SET GLOBAL example_double_thdvar = 302.0000;
-SET SESSION example_double_thdvar = 300.0000;
-
---echo
---echo ================================================================================
---echo 3.3 - CONNECT 3 CLIENTS, SET LOCAL PLUGIN VARS
---echo ================================================================================
-connect(con1, localhost, root,,);
-SET SESSION example_double_thdvar = 300.1111;
---echo
-connect(con2, localhost, root,,);
-SET SESSION example_double_thdvar = 300.2222;
---echo
-connect(con3, localhost, root,,);
-SET SESSION example_double_thdvar = 300.3333;
---echo
---connection default
-
---echo
---echo ================================================================================
---echo 3.4 - VERIFY GLOBAL AND SESSION PLUGIN VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
---echo
---echo # Variables by thread
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-
---echo
---echo ================================================================================
---echo 3.5 - DISCONNECT CLIENTS
---echo ================================================================================
---connection con1
---disconnect con1
---source include/wait_until_disconnected.inc
-
---connection con2
---disconnect con2
---source include/wait_until_disconnected.inc
-
---connection con3
---disconnect con3
---source include/wait_until_disconnected.inc
-
---connection default
-
---echo
---echo ================================================================================
---echo 3.6 - VERIFY SESSION VARS ARE REMOVED
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
---echo
---echo # Variables by thread
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-
---echo
---echo ================================================================================
---echo 3.7 - RECONNECT 3 CLIENTS, SET SESSION VARS FOR EACH
---echo ================================================================================
-connect(con1, localhost, root,,);
-SET SESSION example_double_thdvar = 311.1111;
---echo
-connect(con2, localhost, root,,);
-SET SESSION example_double_thdvar = 322.2222;
---echo
-connect(con3, localhost, root,,);
-SET SESSION example_double_thdvar = 333.3333;
---echo
---connection default
-
---echo
---echo ================================================================================
---echo 3.8 - VERIFY GLOBAL AND SESSION VARS
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
---echo
---echo # Variables by thread
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-
---echo
---echo ================================================================================
---echo 3.9 - UNINSTALL PLUGIN, LEAVE CLIENTS CONNECTED
---echo ================================================================================
-UNINSTALL PLUGIN example;
-
---echo
---echo ================================================================================
---echo 3.10 - VERIFY SESSION VARS ARE REMOVED
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
---echo
---echo # VARIABLES BY THREAD
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-
---echo
---echo ================================================================================
---echo 3.11 - DISCONNECT CLIENTS
---echo ================================================================================
---connection con1
---disconnect con1
---source include/wait_until_disconnected.inc
-
---connection con2
---disconnect con2
---source include/wait_until_disconnected.inc
-
---connection con3
---disconnect con3
---source include/wait_until_disconnected.inc
-
---connection default
-
---echo
---echo ================================================================================
---echo 3.12 - VERIFY CLIENTS ARE REMOVED
---echo ================================================================================
---source ../include/show_plugin_verifier_56.inc
---echo
---echo # VARIABLES BY THREAD
-SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
-WHERE variable_name LIKE "example_%" ORDER BY variable_value;
-
---echo
---echo ================================================================================
---echo TEST 4 - BUG#18008907: DEADLOCK WITH CHANGE_USER, SHOW VARIABLES, INSTALL PLUGIN
---echo ================================================================================
---echo
---disable_result_log
-DELIMITER |;
-
-CREATE PROCEDURE install_no_such_plugin()
-BEGIN
-  INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
-END|
---echo
-CREATE PROCEDURE show_vars()
-BEGIN
-  -- select on information_schema.global_variables
-  -- will fail, still need to cover execution of the code
-  -- to verify potential dead locks.
-  declare continue handler for sqlexception
-  begin
-  end;
-
-  SELECT COUNT(*) FROM information_schema.global_variables;
-  SELECT COUNT(*) FROM performance_schema.global_variables;
-END|
-
-DELIMITER ;|
---enable_result_log
-
---echo
---echo ================================================================================
---echo 4.1 - DEADLOCK SCENARIO 1:
---echo       con1 - has LOCK_system_variables_hash and waits on LOCK_plugin AND
---echo       default - has LOCK_plugin and waits on LOCK_system_variables_hash
---echo ================================================================================
-connect(con1, localhost, root,,);
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
---send call show_vars();
---connection default
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
---send call install_no_such_plugin();
---connection con1
-
---echo
---echo # Without fix, reap will hang.
---disable_warnings
---replace_column 1 #
---reap;
---enable_warnings
-SET DEBUG_SYNC='RESET';
-
---connection default
---replace_regex /(Can\'t open shared library).*$/\1/
---error ER_CANT_OPEN_LIBRARY
---reap;
---echo
-SET DEBUG_SYNC='RESET';
-
---echo
---echo ================================================================================
---echo 4.2 - DEADLOCK SCENARIO 2:
---echo       default - has LOCK_system_variables_hash, waits on LOCK_global_system_variables
---echo       con1 - has LOCK_plugin, waits on LOCK_system_variables_hash AND
---echo       con2 - has LOCK_global_system_variables, waits on LOCK_plugin
---echo ================================================================================
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
---send call show_vars();
---connection con1
-SET DEBUG_SYNC='now WAIT_FOR install_plugin';
-SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
---send call install_no_such_plugin();
-connect(con2, localhost, root,,);
-SET DEBUG_SYNC='now WAIT_FOR create_connection';
-
---echo
---echo # Without fix, deadlock situation will occur on timeout of debug_syncs in
---echo # default and con1.  Because of this, change_user operation hangs.
---echo change_user
-change_user;
---connection con1
---replace_regex /(Can\'t open shared library).*$/\1/
---error ER_CANT_OPEN_LIBRARY
---reap;
-
---echo
---connection default
---replace_column 1 #
---disable_warnings
---reap;
---enable_warnings
-
---echo
---disconnect con2
-
---echo
---echo ================================================================================
---echo 4.3 - DEADLOCK SCENARIO 3: CONCURRENT SHOW VARIABLES AND UNINSTALL PLUGIN
---echo ================================================================================
---echo #
---echo # INSTALL PLUGIN
---echo #
---replace_regex /\.dll/.so/
-eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
---connection con1
-
---echo
---echo # Acquiring LOCK_system_variables_hash and LOCK_plugin_delete
-SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
-
---send call show_vars();
-connect(con2, localhost, root,,);
-
---echo #
---echo # UNINSTALL PLUGIN
---echo #
-SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
---send UNINSTALL PLUGIN example;
---connection default
-
---echo
---echo # Uninstall will wait until SHOW VARIABLES releases LOCK_plugin_delete.
-let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
-                     WHERE INFO='UNINSTALL PLUGIN example' and
-                     STATE='System lock';
---source include/wait_condition.inc
-SET DEBUG_SYNC='now SIGNAL go';
---echo # Connect con1 - reap
---connection con1
---replace_column 1 #
---disable_warnings
---reap
---enable_warnings
---echo # Connect con2 - reap
---connection con2
---disable_warnings
---reap
---enable_warnings
-
---echo
---echo ================================================================================
---echo CLEAN UP
---echo ================================================================================
---connection default
---echo
-DROP PROCEDURE show_vars;
-DROP PROCEDURE install_no_such_plugin;
-SET DEBUG_SYNC='RESET';
-
---echo
---disconnect con1
---disconnect con2
---disable_connect_log
-
---echo
---echo # Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
-
---echo
---echo # Wait till we reached the initial number of concurrent sessions
---source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
index de6037fb6b7..5fe60a01e62 100644
--- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
+++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
@@ -28,7 +28,7 @@
 # prepared statement.
 --source include/no_protocol.inc
 
---source include/turn_off_only_full_group_by.inc
+#--source include/turn_off_only_full_group_by.inc
 
 # Set this to enable debugging output
 let $my_socket_debug_dbug= 0;
@@ -331,7 +331,7 @@ if (`SELECT @tables_match = 0`)
 --connection default
 DROP DATABASE mysqltest;
 
---source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
+#--source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
 
 exit;
 
diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
index 2904702ec83..fc848922667 100644
--- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
+++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
@@ -39,8 +39,6 @@
 # prepared statement.
 --source include/no_protocol.inc
 
-set global session_track_schema=FALSE;
-
 #===================================
 # Set IP address defaults with respect to IPV6 support
 #
@@ -1713,5 +1711,3 @@ DROP SCHEMA mysqlsupertest;
 --source include/wait_until_disconnected.inc
 --connection default
 --enable_query_log
-
-set global session_track_schema=DEFAULT;
diff --git a/mysql-test/suite/perfschema/t/start_server_low_index-master.opt b/mysql-test/suite/perfschema/t/start_server_low_index-master.opt
index 1db42702de6..29cbfa631c3 100644
--- a/mysql-test/suite/perfschema/t/start_server_low_index-master.opt
+++ b/mysql-test/suite/perfschema/t/start_server_low_index-master.opt
@@ -1,2 +1,2 @@
 --loose-enable-performance-schema
---loose-performance_schema_max_index_stat=38
+--loose-performance_schema_max_index_stat=34
diff --git a/mysql-test/suite/perfschema/t/start_server_off.test b/mysql-test/suite/perfschema/t/start_server_off.test
index 4c182b78302..6fdc02acf9b 100644
--- a/mysql-test/suite/perfschema/t/start_server_off.test
+++ b/mysql-test/suite/perfschema/t/start_server_off.test
@@ -49,21 +49,8 @@ truncate performance_schema.events_waits_history_long;
 truncate performance_schema.setup_objects;
 truncate performance_schema.setup_actors;
 
-#
-# Verify SHOW STATUS and SHOW VARIABLES with show_compatibility_56=OFF
-#
-select @@global.show_compatibility_56 into @show_compatibility_56_save;
-set global show_compatibility_56 = OFF;
-
 --disable_warnings
 # Expect that status variables are still accessible
 show global status like "performance_schema%";
 show session status like "performance_schema%";
-
-# Expect that system variables are still accessible
-show global variables like "show_compatibility_56";
-show session variables like "show_compatibility_56";
 --enable_warnings
-
-# Cleanup
-set @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/t/status_reprepare.test b/mysql-test/suite/perfschema/t/status_reprepare.test
index 9aba4799ece..94a8f120633 100644
--- a/mysql-test/suite/perfschema/t/status_reprepare.test
+++ b/mysql-test/suite/perfschema/t/status_reprepare.test
@@ -8,9 +8,6 @@
 --echo ================================================================================
 --echo SETUP
 --echo ================================================================================
---echo # Save current SHOW_COMPATIBILITY_56 setting
-SELECT @@global.show_compatibility_56 INTO @show_compatibility_56_save;
-SET @@global.show_compatibility_56=OFF;
 
 # Create a new connection, to get clean statistics
 connect(con1, localhost, root,,);
@@ -30,9 +27,9 @@ SHOW SESSION STATUS LIKE "%com_stmt_%prepare%";
 #check the statistics
 SELECT * FROM performance_schema.session_status WHERE VARIABLE_NAME LIKE "%com_stmt%";
 
-SELECT VARIABLE_VALUE FROM performance_schema.global_status
-  WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare"
-  INTO @count_global_reprepare_before;
+SELECT VARIABLE_VALUE INTO @count_global_reprepare_before
+  FROM performance_schema.global_status
+  WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare";
 
 # Alter table to make server reprepare the statement
 ALTER TABLE test.t1 ADD COLUMN c2 INTEGER;
@@ -46,9 +43,9 @@ SHOW SESSION STATUS LIKE "%com_stmt_%prepare%";
 #check the statistics
 SELECT * FROM performance_schema.session_status WHERE VARIABLE_NAME LIKE "%com_stmt%";
 
-SELECT VARIABLE_VALUE FROM performance_schema.global_status
-  WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare"
-  INTO @count_global_reprepare_after;
+SELECT VARIABLE_VALUE INTO @count_global_reprepare_after
+  FROM performance_schema.global_status
+  WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare";
 
 # Should increment by 1
 SELECT @count_global_reprepare_after - @count_global_reprepare_before;
@@ -62,6 +59,3 @@ DROP TABLE test.t1;
 
 --disconnect con1
 --connection default
-
---echo # Restore SHOW_COMPATIBILITY_56 setting
-SET @@global.show_compatibility_56 = @show_compatibility_56_save;
diff --git a/mysql-test/suite/perfschema/t/sxlock_func.test b/mysql-test/suite/perfschema/t/sxlock_func.test
index 6d3e6b00fa2..7c7e8fc6189 100644
--- a/mysql-test/suite/perfschema/t/sxlock_func.test
+++ b/mysql-test/suite/perfschema/t/sxlock_func.test
@@ -4,6 +4,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/have_innodb.inc
 
 UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
index 18b89f93c95..9205e2b9232 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
index 06424551a72..60db987b9df 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
index 78cf45baf59..1bac2d52014 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
index 88660a19f12..4909defee60 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
index c4634cbd164..7721599ba5d 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
index a39bbcd1516..ef1e196a151 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
index 838ae96c756..ad34cd9f44f 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
index 0d28340442b..078a6d9e245 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
index bfc628ddb2b..a155619e9aa 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
index 88939fc60ea..c48d39f5eb7 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
index c77ce2e6d10..ff69d164f64 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
index 5c0a6556205..3ee77d05700 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
@@ -1,7 +1,7 @@
 # Tests for the performance schema
 
 # Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
---source include/force_myisam_default.inc
+#--source include/force_myisam_default.inc
 
 --source ../include/table_aggregate_setup.inc
 
diff --git a/mysql-test/suite/perfschema/t/table_schema.test b/mysql-test/suite/perfschema/t/table_schema.test
index f903419bd78..ce53c088c51 100644
--- a/mysql-test/suite/perfschema/t/table_schema.test
+++ b/mysql-test/suite/perfschema/t/table_schema.test
@@ -16,9 +16,9 @@ select * from information_schema.columns where table_schema="performance_schema"
 
 # Count the number of NUMBER_OF_BYTES columns.
 
-select count(*) from information_schema.columns
+select count(*) into @count_byte_columns from information_schema.columns
    where table_schema="performance_schema" and data_type = "bigint"
-   and column_name like "%number_of_bytes" into @count_byte_columns;
+   and column_name like "%number_of_bytes";
 
 # Confirm that at least one column was found.
 
@@ -26,10 +26,10 @@ select @count_byte_columns > 0;
 
 # Confirm that all NUMBER_OF_BYTES columns are BIGINT signed.
 
-select count(*) from information_schema.columns
+select count(*) into @count_byte_signed from information_schema.columns
    where table_schema="performance_schema" and data_type="bigint"
    and column_name like "%number_of_bytes"
-   and column_type not like "%unsigned" into @count_byte_signed;
+   and column_type not like "%unsigned";
 
 select (@count_byte_columns - @count_byte_signed) = 0;
 
@@ -38,9 +38,9 @@ select (@count_byte_columns - @count_byte_signed) = 0;
 #
 # Count the number of OBJECT_INSTANCE_BEGIN columns.
 
-select count(*) from information_schema.columns
+select count(*) into @count_object_columns from information_schema.columns
    where table_schema="performance_schema" and data_type = "bigint"
-   and column_name like "%object_instance_begin" into @count_object_columns;
+   and column_name like "%object_instance_begin";
 
 # Confirm that at least one column was found.
 
@@ -48,10 +48,10 @@ select @count_object_columns > 0;
 
 # Confirm that all OBJECT_INSTANCE_BEGIN columns are BIGINT unsigned.
 
-select count(*) from information_schema.columns
+select count(*) into @count_object_unsigned from information_schema.columns
    where table_schema="performance_schema" and data_type="bigint"
    and column_name like "%object_instance_begin"
-   and column_type like "%unsigned" into @count_object_unsigned;
+   and column_type like "%unsigned";
 
 select (@count_object_columns - @count_object_unsigned) = 0;
 
diff --git a/mysql-test/suite/perfschema/t/threads_history.test b/mysql-test/suite/perfschema/t/threads_history.test
index 093dd24e6ae..f42dd6d0ab4 100644
--- a/mysql-test/suite/perfschema/t/threads_history.test
+++ b/mysql-test/suite/perfschema/t/threads_history.test
@@ -7,7 +7,7 @@
 
 # Presence of the query cache changes query stages,
 # causing noise in the test output
---source include/have_query_cache_disabled.inc
+#--source include/have_query_cache_disabled.inc
 
 create user user1@localhost;
 create user user2@localhost;
diff --git a/mysql-test/suite/perfschema/t/threads_innodb.test b/mysql-test/suite/perfschema/t/threads_innodb.test
index 4880e808657..366c3b82ce8 100644
--- a/mysql-test/suite/perfschema/t/threads_innodb.test
+++ b/mysql-test/suite/perfschema/t/threads_innodb.test
@@ -7,7 +7,7 @@
 --source include/have_innodb.inc
 --source include/have_perfschema.inc
 
---source include/turn_off_only_full_group_by.inc
+#--source include/turn_off_only_full_group_by.inc
 
 # There are several InnoDB io_handler_threads servicing for read IO, write IO etc.
 # The number of these threads is at least for some types configurable.
@@ -20,4 +20,4 @@ FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
 GROUP BY name;
 
---source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
+#--source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
diff --git a/mysql-test/suite/perfschema/t/transaction.test b/mysql-test/suite/perfschema/t/transaction.test
index 052748f1f07..99ddc1eca46 100644
--- a/mysql-test/suite/perfschema/t/transaction.test
+++ b/mysql-test/suite/perfschema/t/transaction.test
@@ -14,6 +14,7 @@
 --disable_query_log
 --source ../include/transaction_setup.inc
 --enable_query_log
+set global binlog_format=ROW;
 
 --echo
 --echo ========================================================================
@@ -302,6 +303,7 @@ XA START 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
 --echo
 --echo ## Expect 1 active XA transaction, state ACTIVE
 --connection default
+
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'ACTIVE', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
 
 --echo
@@ -407,6 +409,8 @@ CALL clear_transaction_tables();
 --echo # STEP 8 - TRANSACTIONAL AND NON-TRANSACTIONAL TABLES
 --echo ========================================================================
 --echo
+--echo ## MariaDB bug: MDEV-6012? MDEV-14436?
+set @mariadb_bug=1;
 
 ## Statements that work with non-transactional engines have no effect on the
 ## transaction state of the connection. For implicit transactions,
@@ -427,7 +431,7 @@ INSERT INTO nt1 VALUES (801, 'NON-TRANSACTIONAL');
 --echo
 --echo ## Expect 0 transactions in events_transactions_current
 --connection default
-CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
 
 --connection con1
 COMMIT;
@@ -435,7 +439,7 @@ COMMIT;
 --echo
 --echo ## Expect 0 transactions in events_transactions_history
 --connection default
-CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
 
 --echo
 --echo #
@@ -450,7 +454,7 @@ INSERT INTO nt1 VALUES (802, 'NON-TRANSACTIONAL');
 --echo
 --echo ## Expect 0 transactions in events_transactions_current
 --connection default
-CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
 
 --echo
 --echo ## Now transactional. Transaction should be started.
@@ -471,7 +475,7 @@ COMMIT;
 --echo ## Expect 1 committed transaction in events_transactions_current and history
 --connection default
 CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
-CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1+@mariadb_bug);
 CALL clear_transaction_tables();
 
 --echo
@@ -727,3 +731,4 @@ DROP TABLE t1;
 DROP TABLE nt1;
 
 --source ../include/transaction_cleanup.inc
+set global binlog_format=default;
diff --git a/mysql-test/suite/perfschema/t/transaction_nested_events.test b/mysql-test/suite/perfschema/t/transaction_nested_events.test
index 11ab1d946c0..4babe47bc77 100644
--- a/mysql-test/suite/perfschema/t/transaction_nested_events.test
+++ b/mysql-test/suite/perfschema/t/transaction_nested_events.test
@@ -217,7 +217,7 @@ SELECT * FROM t1 ORDER BY s1;
 --connection con1
 DELIMITER |;
 --error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-CREATE FUNCTION fn_err1() RETURNS VARCHAR(10) BEGIN START TRANSACTION ; RETURN invalid ; END|
+CREATE FUNCTION fn_err1() RETURNS VARCHAR(10) BEGIN START TRANSACTION ; RETURN 'invalid' ; END|
 DELIMITER ;|
 
 --echo
@@ -241,7 +241,7 @@ SELECT COUNT(*) FROM performance_schema.events_transactions_history;
 --echo
 DELIMITER |;
 --error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-CREATE FUNCTION fn_err2() RETURNS VARCHAR(10) BEGIN COMMIT; RETURN invalid ; END|
+CREATE FUNCTION fn_err2() RETURNS VARCHAR(10) BEGIN COMMIT; RETURN 'invalid' ; END|
 DELIMITER ;|
 
 --echo
diff --git a/mysql-test/suite/perfschema/t/view_table_io.test b/mysql-test/suite/perfschema/t/view_table_io.test
index bafdfae6213..f5b017dc8ad 100644
--- a/mysql-test/suite/perfschema/t/view_table_io.test
+++ b/mysql-test/suite/perfschema/t/view_table_io.test
@@ -4,7 +4,7 @@
 #       the view itself never shows up.
 
 ## To skip the test with QC enabled till BUG#14830950 is fixed.
--- source include/have_QC_Disabled.inc
+#-- source include/have_QC_Disabled.inc
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
diff --git a/mysql-test/suite/rpl/include/rpl_stm_relay_ign_space.inc b/mysql-test/suite/rpl/include/rpl_stm_relay_ign_space.inc
index 41339f539f8..654a5d47cb9 100644
--- a/mysql-test/suite/rpl/include/rpl_stm_relay_ign_space.inc
+++ b/mysql-test/suite/rpl/include/rpl_stm_relay_ign_space.inc
@@ -41,7 +41,7 @@ INSERT INTO t1 VALUES ('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # wait for the SQL thread to sleep
 --let $show_statement= SHOW PROCESSLIST
 --let $field= State
---let $condition= = 'Slave has read all relay log; waiting for the slave I/O thread to update it'
+--let $condition= = 'Slave has read all relay log; waiting for more updates'
 --source include/wait_show_condition.inc
 
 # now the io thread has set rli->ignore_space_limit
diff --git a/mysql-test/suite/sql_sequence/rebuild.result b/mysql-test/suite/sql_sequence/rebuild.result
index e5407ef69f3..6348d1775ab 100644
--- a/mysql-test/suite/sql_sequence/rebuild.result
+++ b/mysql-test/suite/sql_sequence/rebuild.result
@@ -5,157 +5,14 @@ CREATE SEQUENCE s1 ENGINE=InnoDB;
 ALTER TABLE s1 FORCE;
 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
 CREATE TABLE t2 (b VARCHAR(64)) ENGINE=MyISAM;
-CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS;
+CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA='test';
 INSERT INTO t1 VALUES (1);
 select * from t1;
 a
 1
 select * from t2;
 b
-ALL_PLUGINS
-APPLICABLE_ROLES
-CHARACTER_SETS
-CHECK_CONSTRAINTS
-CLIENT_STATISTICS
-COLLATIONS
-COLLATION_CHARACTER_SET_APPLICABILITY
-COLUMNS
-COLUMN_PRIVILEGES
-ENABLED_ROLES
-ENGINES
-EVENTS
-FILES
-GEOMETRY_COLUMNS
-GLOBAL_STATUS
-GLOBAL_VARIABLES
-INDEX_STATISTICS
-INNODB_BUFFER_PAGE
-INNODB_BUFFER_PAGE_LRU
-INNODB_BUFFER_POOL_STATS
-INNODB_CMPMEM
-INNODB_CMP_PER_INDEX
-INNODB_LOCKS
-INNODB_LOCK_WAITS
-INNODB_METRICS
-INNODB_SYS_COLUMNS
-INNODB_SYS_FIELDS
-INNODB_SYS_FOREIGN
-INNODB_SYS_FOREIGN_COLS
-INNODB_SYS_INDEXES
-INNODB_SYS_TABLES
-INNODB_SYS_VIRTUAL
-INNODB_TRX
-KEY_CACHES
-KEY_COLUMN_USAGE
-OPTIMIZER_TRACE
-PARAMETERS
-PARTITIONS
-PLUGINS
-PROCESSLIST
-PROFILING
-REFERENTIAL_CONSTRAINTS
-ROUTINES
-SCHEMATA
-SCHEMA_PRIVILEGES
-SESSION_STATUS
-SESSION_VARIABLES
-SPATIAL_REF_SYS
-STATISTICS
-SYSTEM_VARIABLES
-TABLES
-TABLESPACES
-TABLE_CONSTRAINTS
-TABLE_PRIVILEGES
-TABLE_STATISTICS
-TRIGGERS
-USER_PRIVILEGES
-USER_STATISTICS
-VIEWS
-accounts
-column_stats
-columns_priv
-cond_instances
-db
-event
-events_stages_current
-events_stages_history
-events_stages_history_long
-events_stages_summary_by_account_by_event_name
-events_stages_summary_by_host_by_event_name
-events_stages_summary_by_thread_by_event_name
-events_stages_summary_by_user_by_event_name
-events_stages_summary_global_by_event_name
-events_statements_current
-events_statements_history
-events_statements_history_long
-events_statements_summary_by_account_by_event_name
-events_statements_summary_by_digest
-events_statements_summary_by_host_by_event_name
-events_statements_summary_by_thread_by_event_name
-events_statements_summary_by_user_by_event_name
-events_statements_summary_global_by_event_name
-events_waits_current
-events_waits_history
-events_waits_history_long
-events_waits_summary_by_account_by_event_name
-events_waits_summary_by_host_by_event_name
-events_waits_summary_by_instance
-events_waits_summary_by_thread_by_event_name
-events_waits_summary_by_user_by_event_name
-events_waits_summary_global_by_event_name
-file_instances
-file_summary_by_event_name
-file_summary_by_instance
-func
-general_log
-global_priv
-global_suppressions
-gtid_slave_pos
-help_category
-help_keyword
-help_relation
-help_topic
-host_cache
-hosts
-index_stats
-innodb_index_stats
-innodb_table_stats
-mutex_instances
-objects_summary_global_by_type
-performance_timers
-plugin
-proc
-procs_priv
-proxies_priv
-roles_mapping
-rwlock_instances
 s1
-servers
-session_account_connect_attrs
-session_connect_attrs
-setup_actors
-setup_consumers
-setup_instruments
-setup_objects
-setup_timers
-slow_log
-socket_instances
-socket_summary_by_event_name
-socket_summary_by_instance
 t1
 t2
-table_io_waits_summary_by_index_usage
-table_io_waits_summary_by_table
-table_lock_waits_summary_by_table
-table_stats
-tables_priv
-test_suppressions
-threads
-time_zone
-time_zone_leap_second
-time_zone_name
-time_zone_transition
-time_zone_transition_type
-transaction_registry
-users
 DROP TABLE t1, t2, s1;
diff --git a/mysql-test/suite/sql_sequence/rebuild.test b/mysql-test/suite/sql_sequence/rebuild.test
index 7c00e0be7cc..7163a79e884 100644
--- a/mysql-test/suite/sql_sequence/rebuild.test
+++ b/mysql-test/suite/sql_sequence/rebuild.test
@@ -8,7 +8,7 @@ CREATE SEQUENCE s1 ENGINE=InnoDB;
 ALTER TABLE s1 FORCE;
 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
 CREATE TABLE t2 (b VARCHAR(64)) ENGINE=MyISAM;
-CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS;
+CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA='test';
 INSERT INTO t1 VALUES (1);
 --sorted_result
 select * from t1;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
index c31476ed605..8657919e38c 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_server_embedded.result	2020-02-13 13:02:28.604373957 +0200
-+++ suite/sys_vars/r/sysvars_server_embedded,32bit.reject	2020-02-13 13:19:05.596616949 +0200
+--- mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
++++ mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
 @@ -35,7 +35,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	ARIA_BLOCK_SIZE
@@ -817,6 +817,24 @@
  NUMERIC_MAX_VALUE	1024
 @@ -2375,7 +2375,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2385,7 +2385,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1024
+@@ -2395,7 +2395,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT
@@ -824,7 +842,7 @@
  VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2385,7 +2385,7 @@
+@@ -2405,7 +2405,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -833,7 +851,7 @@
  VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2395,7 +2395,7 @@
+@@ -2415,7 +2415,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_HOSTS_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -842,7 +860,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2405,7 +2405,7 @@
+@@ -2425,7 +2425,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_COND_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -851,7 +869,7 @@
  VARIABLE_COMMENT	Maximum number of condition instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2415,7 +2415,7 @@
+@@ -2435,7 +2435,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_COND_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -860,7 +878,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2425,7 +2425,7 @@
+@@ -2445,7 +2445,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH
  VARIABLE_SCOPE	GLOBAL
@@ -869,7 +887,7 @@
  VARIABLE_COMMENT	Maximum length considered for digest text, when stored in performance_schema tables.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2435,7 +2435,7 @@
+@@ -2455,7 +2455,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_FILE_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -878,7 +896,7 @@
  VARIABLE_COMMENT	Maximum number of file instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2445,7 +2445,7 @@
+@@ -2465,7 +2465,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_FILE_HANDLES
  VARIABLE_SCOPE	GLOBAL
@@ -887,7 +905,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented files.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2455,7 +2455,7 @@
+@@ -2475,7 +2475,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -896,7 +914,34 @@
  VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2465,7 +2465,7 @@
+@@ -2485,7 +2485,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_INDEX_STAT
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2495,7 +2495,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Maximum number of memory pool instruments.
+ NUMERIC_MIN_VALUE	0
+ NUMERIC_MAX_VALUE	1024
+@@ -2505,7 +2505,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	104857600
+@@ -2515,7 +2515,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -905,7 +950,7 @@
  VARIABLE_COMMENT	Maximum number of mutex instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2475,7 +2475,7 @@
+@@ -2525,7 +2525,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -914,7 +959,25 @@
  VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	104857600
-@@ -2485,7 +2485,7 @@
+@@ -2535,7 +2535,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2545,7 +2545,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2555,7 +2555,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -923,7 +986,7 @@
  VARIABLE_COMMENT	Maximum number of rwlock instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2495,7 +2495,7 @@
+@@ -2565,7 +2565,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -932,7 +995,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	104857600
-@@ -2505,7 +2505,7 @@
+@@ -2575,7 +2575,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -941,7 +1004,7 @@
  VARIABLE_COMMENT	Maximum number of socket instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2515,7 +2515,7 @@
+@@ -2585,7 +2585,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -950,7 +1013,16 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2525,7 +2525,7 @@
+@@ -2595,7 +2595,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum length of displayed sql text.
+ NUMERIC_MIN_VALUE	0
+ NUMERIC_MAX_VALUE	1048576
+@@ -2605,7 +2605,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -959,7 +1031,7 @@
  VARIABLE_COMMENT	Maximum number of stage instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2535,7 +2535,7 @@
+@@ -2615,7 +2615,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -968,7 +1040,16 @@
  VARIABLE_COMMENT	Maximum number of statement instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2545,7 +2545,7 @@
+@@ -2625,7 +2625,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	256
+@@ -2635,7 +2635,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
  VARIABLE_SCOPE	GLOBAL
@@ -977,7 +1058,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2555,7 +2555,7 @@
+@@ -2645,7 +2645,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -986,7 +1067,16 @@
  VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2565,7 +2565,7 @@
+@@ -2655,7 +2655,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2665,7 +2665,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -995,7 +1085,7 @@
  VARIABLE_COMMENT	Maximum number of thread instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2575,7 +2575,7 @@
+@@ -2675,7 +2675,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -1004,7 +1094,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2585,7 +2585,7 @@
+@@ -2685,7 +2685,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -1013,25 +1103,25 @@
  VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2595,7 +2595,7 @@
+@@ -2695,7 +2695,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE
  VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
  VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
- NUMERIC_MIN_VALUE	0
+ NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2605,7 +2605,7 @@
+@@ -2705,7 +2705,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE
  VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
  VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
- NUMERIC_MIN_VALUE	0
+ NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2615,7 +2615,7 @@
+@@ -2715,7 +2715,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_USERS_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -1040,7 +1130,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2665,7 +2665,7 @@
+@@ -2765,7 +2765,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PRELOAD_BUFFER_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1049,7 +1139,7 @@
  VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -2685,7 +2685,7 @@
+@@ -2785,7 +2785,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	PROFILING_HISTORY_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1058,7 +1148,7 @@
  VARIABLE_COMMENT	Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	100
-@@ -2695,7 +2695,7 @@
+@@ -2795,7 +2795,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PROGRESS_REPORT_TIME
  VARIABLE_SCOPE	SESSION
@@ -1067,7 +1157,7 @@
  VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2755,7 +2755,7 @@
+@@ -2855,7 +2855,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	QUERY_ALLOC_BLOCK_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1076,7 +1166,7 @@
  VARIABLE_COMMENT	Allocation block size for query parsing and execution
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -2765,7 +2765,7 @@
+@@ -2865,7 +2865,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	QUERY_CACHE_LIMIT
  VARIABLE_SCOPE	GLOBAL
@@ -1085,7 +1175,7 @@
  VARIABLE_COMMENT	Don't cache results that are bigger than this
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2775,7 +2775,7 @@
+@@ -2875,7 +2875,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	QUERY_CACHE_MIN_RES_UNIT
  VARIABLE_SCOPE	GLOBAL
@@ -1094,7 +1184,7 @@
  VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2788,7 +2788,7 @@
+@@ -2888,7 +2888,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	The memory allocated to store results from old queries
  NUMERIC_MIN_VALUE	0
@@ -1103,7 +1193,7 @@
  NUMERIC_BLOCK_SIZE	1024
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2825,7 +2825,7 @@
+@@ -2925,7 +2925,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	QUERY_PREALLOC_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1112,7 +1202,7 @@
  VARIABLE_COMMENT	Persistent buffer for query parsing and execution
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -2838,7 +2838,7 @@
+@@ -2938,7 +2938,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
  NUMERIC_MIN_VALUE	0
@@ -1121,7 +1211,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2848,14 +2848,14 @@
+@@ -2948,14 +2948,14 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
  NUMERIC_MIN_VALUE	0
@@ -1138,7 +1228,7 @@
  VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
  NUMERIC_MIN_VALUE	4096
  NUMERIC_MAX_VALUE	4294967295
-@@ -2865,7 +2865,7 @@
+@@ -2965,7 +2965,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	READ_BUFFER_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1147,7 +1237,7 @@
  VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
  NUMERIC_MIN_VALUE	8192
  NUMERIC_MAX_VALUE	2147483647
-@@ -2885,7 +2885,7 @@
+@@ -2985,7 +2985,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	READ_RND_BUFFER_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1156,7 +1246,7 @@
  VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	2147483647
-@@ -2895,10 +2895,10 @@
+@@ -2995,10 +2995,10 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	ROWID_MERGE_BUFF_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1169,7 +1259,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2935,7 +2935,7 @@
+@@ -3035,7 +3035,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SERVER_ID
  VARIABLE_SCOPE	SESSION
@@ -1178,7 +1268,7 @@
  VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -3005,7 +3005,7 @@
+@@ -3105,7 +3105,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	SLAVE_MAX_ALLOWED_PACKET
  VARIABLE_SCOPE	GLOBAL
@@ -1187,7 +1277,7 @@
  VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -3015,7 +3015,7 @@
+@@ -3115,7 +3115,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLOW_LAUNCH_TIME
  VARIABLE_SCOPE	GLOBAL
@@ -1196,7 +1286,7 @@
  VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	31536000
-@@ -3058,7 +3058,7 @@
+@@ -3158,7 +3158,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
  NUMERIC_MIN_VALUE	1024
@@ -1205,7 +1295,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3265,7 +3265,7 @@
+@@ -3365,7 +3365,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	STORED_PROGRAM_CACHE
  VARIABLE_SCOPE	GLOBAL
@@ -1214,7 +1304,7 @@
  VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	524288
-@@ -3345,7 +3345,7 @@
+@@ -3445,7 +3445,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	TABLE_DEFINITION_CACHE
  VARIABLE_SCOPE	GLOBAL
@@ -1223,7 +1313,7 @@
  VARIABLE_COMMENT	The number of cached table definitions
  NUMERIC_MIN_VALUE	400
  NUMERIC_MAX_VALUE	2097152
-@@ -3355,7 +3355,7 @@
+@@ -3455,7 +3455,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	TABLE_OPEN_CACHE
  VARIABLE_SCOPE	GLOBAL
@@ -1232,7 +1322,7 @@
  VARIABLE_COMMENT	The number of cached open tables
  NUMERIC_MIN_VALUE	10
  NUMERIC_MAX_VALUE	1048576
-@@ -3415,7 +3415,7 @@
+@@ -3515,7 +3515,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	THREAD_CACHE_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -1241,7 +1331,7 @@
  VARIABLE_COMMENT	How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16384
-@@ -3498,7 +3498,7 @@
+@@ -3598,7 +3598,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Max size for data for an internal temporary on-disk MyISAM or Aria table.
  NUMERIC_MIN_VALUE	1024
@@ -1250,7 +1340,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3508,7 +3508,7 @@
+@@ -3608,7 +3608,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size.
  NUMERIC_MIN_VALUE	0
@@ -1259,7 +1349,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3518,14 +3518,14 @@
+@@ -3618,14 +3618,14 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table.
  NUMERIC_MIN_VALUE	0
@@ -1276,7 +1366,7 @@
  VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	134217728
-@@ -3535,7 +3535,7 @@
+@@ -3635,7 +3635,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	TRANSACTION_PREALLOC_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1285,7 +1375,7 @@
  VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	134217728
-@@ -3675,7 +3675,7 @@
+@@ -3775,7 +3775,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	WAIT_TIMEOUT
  VARIABLE_SCOPE	SESSION
@@ -1294,7 +1384,7 @@
  VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -3702,7 +3702,7 @@
+@@ -3802,7 +3802,7 @@
  VARIABLE_NAME	LOG_TC_SIZE
  GLOBAL_VALUE_ORIGIN	AUTO
  VARIABLE_SCOPE	GLOBAL
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 bacdc115ca3..706b33778da 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2373,6 +2373,26 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1024
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT
@@ -2463,6 +2483,36 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_INDEX_STAT
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Maximum number of memory pool instruments.
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	1024
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	104857600
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2483,6 +2533,26 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2523,6 +2593,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum length of displayed sql text.
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2543,6 +2623,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
+NUMERIC_MIN_VALUE	1
+NUMERIC_MAX_VALUE	256
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT
@@ -2563,6 +2653,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2595,9 +2695,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	BIGINT
 VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
-NUMERIC_MIN_VALUE	0
+NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
@@ -2605,9 +2705,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	BIGINT
 VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
-NUMERIC_MIN_VALUE	0
+NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
index 1c1af98f068..15c37dc42cb 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
@@ -1,5 +1,5 @@
---- suite/sys_vars/r/sysvars_server_notembedded.result	2020-02-13 13:02:28.604373957 +0200
-+++ suite/sys_vars/r/sysvars_server_notembedded.reject	2020-02-13 13:12:51.778369858 +0200
+--- mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
++++ mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.result~
 @@ -35,7 +35,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	ARIA_BLOCK_SIZE
@@ -817,6 +817,24 @@
  NUMERIC_MAX_VALUE	1024
 @@ -2535,7 +2535,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2545,7 +2545,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1024
+@@ -2555,7 +2555,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT
@@ -824,7 +842,7 @@
  VARIABLE_COMMENT	Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2545,7 +2545,7 @@
+@@ -2565,7 +2565,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -833,7 +851,7 @@
  VARIABLE_COMMENT	Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2555,7 +2555,7 @@
+@@ -2575,7 +2575,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_HOSTS_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -842,7 +860,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2565,7 +2565,7 @@
+@@ -2585,7 +2585,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_COND_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -851,7 +869,7 @@
  VARIABLE_COMMENT	Maximum number of condition instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2575,7 +2575,7 @@
+@@ -2595,7 +2595,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_COND_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -860,7 +878,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2585,7 +2585,7 @@
+@@ -2605,7 +2605,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH
  VARIABLE_SCOPE	GLOBAL
@@ -869,7 +887,7 @@
  VARIABLE_COMMENT	Maximum length considered for digest text, when stored in performance_schema tables.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2595,7 +2595,7 @@
+@@ -2615,7 +2615,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_FILE_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -878,7 +896,7 @@
  VARIABLE_COMMENT	Maximum number of file instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2605,7 +2605,7 @@
+@@ -2625,7 +2625,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_FILE_HANDLES
  VARIABLE_SCOPE	GLOBAL
@@ -887,7 +905,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented files.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1048576
-@@ -2615,7 +2615,7 @@
+@@ -2635,7 +2635,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -896,7 +914,34 @@
  VARIABLE_COMMENT	Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2625,7 +2625,7 @@
+@@ -2645,7 +2645,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_INDEX_STAT
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2655,7 +2655,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Maximum number of memory pool instruments.
+ NUMERIC_MIN_VALUE	0
+ NUMERIC_MAX_VALUE	1024
+@@ -2665,7 +2665,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	104857600
+@@ -2675,7 +2675,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -905,7 +950,7 @@
  VARIABLE_COMMENT	Maximum number of mutex instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2635,7 +2635,7 @@
+@@ -2685,7 +2685,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -914,7 +959,25 @@
  VARIABLE_COMMENT	Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	104857600
-@@ -2645,7 +2645,7 @@
+@@ -2695,7 +2695,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2705,7 +2705,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2715,7 +2715,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -923,7 +986,7 @@
  VARIABLE_COMMENT	Maximum number of rwlock instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2655,7 +2655,7 @@
+@@ -2725,7 +2725,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -932,7 +995,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	104857600
-@@ -2665,7 +2665,7 @@
+@@ -2735,7 +2735,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -941,7 +1004,7 @@
  VARIABLE_COMMENT	Maximum number of socket instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2675,7 +2675,7 @@
+@@ -2745,7 +2745,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -950,7 +1013,16 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2685,7 +2685,7 @@
+@@ -2755,7 +2755,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum length of displayed sql text.
+ NUMERIC_MIN_VALUE	0
+ NUMERIC_MAX_VALUE	1048576
+@@ -2765,7 +2765,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -959,7 +1031,7 @@
  VARIABLE_COMMENT	Maximum number of stage instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2695,7 +2695,7 @@
+@@ -2775,7 +2775,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -968,7 +1040,16 @@
  VARIABLE_COMMENT	Maximum number of statement instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2705,7 +2705,7 @@
+@@ -2785,7 +2785,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT UNSIGNED
++VARIABLE_TYPE	INT UNSIGNED
+ VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
+ NUMERIC_MIN_VALUE	1
+ NUMERIC_MAX_VALUE	256
+@@ -2795,7 +2795,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
  VARIABLE_SCOPE	GLOBAL
@@ -977,7 +1058,7 @@
  VARIABLE_COMMENT	Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2715,7 +2715,7 @@
+@@ -2805,7 +2805,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -986,7 +1067,16 @@
  VARIABLE_COMMENT	Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2725,7 +2725,7 @@
+@@ -2815,7 +2815,7 @@
+ COMMAND_LINE_ARGUMENT	REQUIRED
+ VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT
+ VARIABLE_SCOPE	GLOBAL
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
+ VARIABLE_COMMENT	Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+ NUMERIC_MIN_VALUE	-1
+ NUMERIC_MAX_VALUE	1048576
+@@ -2825,7 +2825,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
  VARIABLE_SCOPE	GLOBAL
@@ -995,7 +1085,7 @@
  VARIABLE_COMMENT	Maximum number of thread instruments.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	256
-@@ -2735,7 +2735,7 @@
+@@ -2835,7 +2835,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES
  VARIABLE_SCOPE	GLOBAL
@@ -1004,7 +1094,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2745,7 +2745,7 @@
+@@ -2845,7 +2845,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -1013,25 +1103,25 @@
  VARIABLE_COMMENT	Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2755,7 +2755,7 @@
+@@ -2855,7 +2855,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE
  VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
  VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
- NUMERIC_MIN_VALUE	0
+ NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1024
-@@ -2765,7 +2765,7 @@
+@@ -2865,7 +2865,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE
  VARIABLE_SCOPE	GLOBAL
--VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_TYPE	INT UNSIGNED
+-VARIABLE_TYPE	BIGINT
++VARIABLE_TYPE	INT
  VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
- NUMERIC_MIN_VALUE	0
+ NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2775,7 +2775,7 @@
+@@ -2875,7 +2875,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PERFORMANCE_SCHEMA_USERS_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -1040,7 +1130,7 @@
  VARIABLE_COMMENT	Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
  NUMERIC_MIN_VALUE	-1
  NUMERIC_MAX_VALUE	1048576
-@@ -2825,7 +2825,7 @@
+@@ -2925,7 +2925,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PRELOAD_BUFFER_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1049,7 +1139,7 @@
  VARIABLE_COMMENT	The size of the buffer that is allocated when preloading indexes
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -2845,7 +2845,7 @@
+@@ -2945,7 +2945,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	PROFILING_HISTORY_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1058,7 +1148,7 @@
  VARIABLE_COMMENT	Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	100
-@@ -2855,7 +2855,7 @@
+@@ -2955,7 +2955,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	PROGRESS_REPORT_TIME
  VARIABLE_SCOPE	SESSION
@@ -1067,7 +1157,7 @@
  VARIABLE_COMMENT	Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2915,7 +2915,7 @@
+@@ -3015,7 +3015,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	QUERY_ALLOC_BLOCK_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1076,7 +1166,7 @@
  VARIABLE_COMMENT	Allocation block size for query parsing and execution
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -2925,7 +2925,7 @@
+@@ -3025,7 +3025,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	QUERY_CACHE_LIMIT
  VARIABLE_SCOPE	GLOBAL
@@ -1085,7 +1175,7 @@
  VARIABLE_COMMENT	Don't cache results that are bigger than this
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2935,7 +2935,7 @@
+@@ -3035,7 +3035,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	QUERY_CACHE_MIN_RES_UNIT
  VARIABLE_SCOPE	GLOBAL
@@ -1094,7 +1184,7 @@
  VARIABLE_COMMENT	The minimum size for blocks allocated by the query cache
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -2948,7 +2948,7 @@
+@@ -3048,7 +3048,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	The memory allocated to store results from old queries
  NUMERIC_MIN_VALUE	0
@@ -1103,7 +1193,7 @@
  NUMERIC_BLOCK_SIZE	1024
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -2985,7 +2985,7 @@
+@@ -3085,7 +3085,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	QUERY_PREALLOC_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1112,7 +1202,7 @@
  VARIABLE_COMMENT	Persistent buffer for query parsing and execution
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	4294967295
-@@ -2998,7 +2998,7 @@
+@@ -3098,7 +3098,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
  NUMERIC_MIN_VALUE	0
@@ -1121,7 +1211,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3008,14 +3008,14 @@
+@@ -3108,14 +3108,14 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
  NUMERIC_MIN_VALUE	0
@@ -1138,7 +1228,7 @@
  VARIABLE_COMMENT	Allocation block size for storing ranges during optimization
  NUMERIC_MIN_VALUE	4096
  NUMERIC_MAX_VALUE	4294967295
-@@ -3028,14 +3028,14 @@
+@@ -3128,14 +3128,14 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Maximum speed(KB/s) to read binlog from master (0 = no limit)
  NUMERIC_MIN_VALUE	0
@@ -1155,7 +1245,7 @@
  VARIABLE_COMMENT	Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
  NUMERIC_MIN_VALUE	8192
  NUMERIC_MAX_VALUE	2147483647
-@@ -3055,7 +3055,7 @@
+@@ -3155,7 +3155,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	READ_RND_BUFFER_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1164,7 +1254,7 @@
  VARIABLE_COMMENT	When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	2147483647
-@@ -3255,10 +3255,10 @@
+@@ -3355,10 +3355,10 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	ROWID_MERGE_BUFF_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1177,7 +1267,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3275,20 +3275,20 @@
+@@ -3375,20 +3375,20 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	RPL_SEMI_SYNC_MASTER_TIMEOUT
  VARIABLE_SCOPE	GLOBAL
@@ -1202,7 +1292,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3345,10 +3345,10 @@
+@@ -3445,10 +3445,10 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	RPL_SEMI_SYNC_SLAVE_TRACE_LEVEL
  VARIABLE_SCOPE	GLOBAL
@@ -1215,7 +1305,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3385,7 +3385,7 @@
+@@ -3485,7 +3485,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SERVER_ID
  VARIABLE_SCOPE	SESSION
@@ -1224,7 +1314,7 @@
  VARIABLE_COMMENT	Uniquely identifies the server instance in the community of replication partners
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	4294967295
-@@ -3525,7 +3525,7 @@
+@@ -3625,7 +3625,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLAVE_DOMAIN_PARALLEL_THREADS
  VARIABLE_SCOPE	GLOBAL
@@ -1233,7 +1323,7 @@
  VARIABLE_COMMENT	Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16383
-@@ -3555,7 +3555,7 @@
+@@ -3655,7 +3655,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLAVE_MAX_ALLOWED_PACKET
  VARIABLE_SCOPE	GLOBAL
@@ -1242,7 +1332,7 @@
  VARIABLE_COMMENT	The maximum packet length to sent successfully from the master to slave.
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	1073741824
-@@ -3575,7 +3575,7 @@
+@@ -3675,7 +3675,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLAVE_PARALLEL_MAX_QUEUED
  VARIABLE_SCOPE	GLOBAL
@@ -1251,7 +1341,7 @@
  VARIABLE_COMMENT	Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	2147483647
-@@ -3595,7 +3595,7 @@
+@@ -3695,7 +3695,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	SLAVE_PARALLEL_THREADS
  VARIABLE_SCOPE	GLOBAL
@@ -1260,7 +1350,7 @@
  VARIABLE_COMMENT	If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16383
-@@ -3605,7 +3605,7 @@
+@@ -3705,7 +3705,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLAVE_PARALLEL_WORKERS
  VARIABLE_SCOPE	GLOBAL
@@ -1269,7 +1359,7 @@
  VARIABLE_COMMENT	Alias for slave_parallel_threads
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16383
-@@ -3645,7 +3645,7 @@
+@@ -3745,7 +3745,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	SLAVE_TRANSACTION_RETRIES
  VARIABLE_SCOPE	GLOBAL
@@ -1278,7 +1368,7 @@
  VARIABLE_COMMENT	Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock, elapsed lock wait timeout or listed in slave_transaction_retry_errors, before giving up and stopping
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
-@@ -3665,7 +3665,7 @@
+@@ -3765,7 +3765,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLAVE_TRANSACTION_RETRY_INTERVAL
  VARIABLE_SCOPE	GLOBAL
@@ -1287,7 +1377,7 @@
  VARIABLE_COMMENT	Interval of the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout or listed in slave_transaction_retry_errors
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	3600
-@@ -3685,7 +3685,7 @@
+@@ -3785,7 +3785,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	SLOW_LAUNCH_TIME
  VARIABLE_SCOPE	GLOBAL
@@ -1296,7 +1386,7 @@
  VARIABLE_COMMENT	If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	31536000
-@@ -3728,7 +3728,7 @@
+@@ -3828,7 +3828,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Each thread that needs to do a sort allocates a buffer of this size
  NUMERIC_MIN_VALUE	1024
@@ -1305,7 +1395,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -3945,7 +3945,7 @@
+@@ -4045,7 +4045,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	STORED_PROGRAM_CACHE
  VARIABLE_SCOPE	GLOBAL
@@ -1314,7 +1404,7 @@
  VARIABLE_COMMENT	The soft upper limit for number of cached stored routines for one connection.
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	524288
-@@ -4045,7 +4045,7 @@
+@@ -4145,7 +4145,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	TABLE_DEFINITION_CACHE
  VARIABLE_SCOPE	GLOBAL
@@ -1323,7 +1413,7 @@
  VARIABLE_COMMENT	The number of cached table definitions
  NUMERIC_MIN_VALUE	400
  NUMERIC_MAX_VALUE	2097152
-@@ -4055,7 +4055,7 @@
+@@ -4155,7 +4155,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	TABLE_OPEN_CACHE
  VARIABLE_SCOPE	GLOBAL
@@ -1332,7 +1422,7 @@
  VARIABLE_COMMENT	The number of cached open tables
  NUMERIC_MIN_VALUE	10
  NUMERIC_MAX_VALUE	1048576
-@@ -4115,7 +4115,7 @@
+@@ -4215,7 +4215,7 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	THREAD_CACHE_SIZE
  VARIABLE_SCOPE	GLOBAL
@@ -1341,7 +1431,7 @@
  VARIABLE_COMMENT	How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	16384
-@@ -4288,7 +4288,7 @@
+@@ -4388,7 +4388,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Max size for data for an internal temporary on-disk MyISAM or Aria table.
  NUMERIC_MIN_VALUE	1024
@@ -1350,7 +1440,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -4298,7 +4298,7 @@
+@@ -4398,7 +4398,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size.
  NUMERIC_MIN_VALUE	0
@@ -1359,7 +1449,7 @@
  NUMERIC_BLOCK_SIZE	1
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
-@@ -4308,14 +4308,14 @@
+@@ -4408,14 +4408,14 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table.
  NUMERIC_MIN_VALUE	0
@@ -1376,7 +1466,7 @@
  VARIABLE_COMMENT	Allocation block size for transactions to be stored in binary log
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	134217728
-@@ -4325,7 +4325,7 @@
+@@ -4425,7 +4425,7 @@
  COMMAND_LINE_ARGUMENT	REQUIRED
  VARIABLE_NAME	TRANSACTION_PREALLOC_SIZE
  VARIABLE_SCOPE	SESSION
@@ -1385,7 +1475,7 @@
  VARIABLE_COMMENT	Persistent buffer for transactions to be stored in binary log
  NUMERIC_MIN_VALUE	1024
  NUMERIC_MAX_VALUE	134217728
-@@ -4465,7 +4465,7 @@
+@@ -4565,7 +4565,7 @@
  COMMAND_LINE_ARGUMENT	NULL
  VARIABLE_NAME	WAIT_TIMEOUT
  VARIABLE_SCOPE	SESSION
@@ -1394,7 +1484,7 @@
  VARIABLE_COMMENT	The number of seconds the server waits for activity on a connection before closing it
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	31536000
-@@ -4492,7 +4492,7 @@
+@@ -4592,7 +4592,7 @@
  VARIABLE_NAME	LOG_TC_SIZE
  GLOBAL_VALUE_ORIGIN	AUTO
  VARIABLE_SCOPE	GLOBAL
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 d0e07e54bc9..5528130036d 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -2533,6 +2533,26 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Number of rows in EVENTS_TRANSACTIONS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Number of rows per thread in EVENTS_TRANSACTIONS_HISTORY. Use 0 to disable, -1 for automated sizing.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1024
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT
@@ -2623,6 +2643,36 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_INDEX_STAT
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of index statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Maximum number of memory pool instruments.
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	1024
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of metadata locks. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	104857600
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2643,6 +2693,26 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of instrumented prepared statements. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of instrumented programs. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2683,6 +2753,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum length of displayed sql text.
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2703,6 +2783,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Number of rows per thread in EVENTS_STATEMENTS_CURRENT.
+NUMERIC_MIN_VALUE	1
+NUMERIC_MAX_VALUE	256
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT
@@ -2723,6 +2813,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BIGINT
+VARIABLE_COMMENT	Maximum number of lock statistics for instrumented tables. Use 0 to disable, -1 for automated scaling.
+NUMERIC_MIN_VALUE	-1
+NUMERIC_MAX_VALUE	1048576
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
@@ -2755,9 +2855,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	BIGINT
 VARIABLE_COMMENT	Maximum number of rows in SETUP_ACTORS.
-NUMERIC_MIN_VALUE	0
+NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1024
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
@@ -2765,9 +2865,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE
 VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_TYPE	BIGINT
 VARIABLE_COMMENT	Maximum number of rows in SETUP_OBJECTS.
-NUMERIC_MIN_VALUE	0
+NUMERIC_MIN_VALUE	-1
 NUMERIC_MAX_VALUE	1048576
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL